From 2d2ec25ed5cb1bb680f8c4680d4759f9a6d47784 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 6 Sep 2018 13:51:38 +0000
Subject: [PATCH] SW-164: made many cmake files compliant with lofar-cpack
 packaging

---
 .gitattributes                                     |  1 -
 Docker/CMakeLists.txt                              |  4 ++++
 LCS/Common/include/Common/CMakeLists.txt           | 14 ++++++++++----
 LCS/MessageBus/include/MessageBus/CMakeLists.txt   |  8 ++++++--
 LCS/PyServiceSkeleton/Server/bin/CMakeLists.txt    |  5 ++---
 LCS/pyparameterset/src/CMakeLists.txt              |  5 ++++-
 LCS/pytools/include/pytools/CMakeLists.txt         |  5 ++++-
 .../TaskManagement/Server/bin/CMakeLists.txt       |  5 ++---
 MAC/Services/src/CMakeLists.txt                    |  5 ++---
 .../Cleanup/AutoCleanupService/CMakeLists.txt      |  5 ++---
 .../Cleanup/CleanupService/CMakeLists.txt          |  5 ++---
 .../StorageQueryService/CMakeLists.txt             |  5 ++---
 SAS/OTDB_Services/CMakeLists.txt                   |  4 ++--
 SAS/QPIDInfrastructure/bin/CMakeLists.txt          |  2 +-
 SAS/QPIDInfrastructure/sql/CMakeLists.txt          |  3 +--
 .../OTDBtoRATaskStatusPropagator/CMakeLists.txt    |  5 ++---
 .../RATaskSpecifiedService/bin/CMakeLists.txt      |  5 ++---
 .../bin/CMakeLists.txt                             |  5 ++---
 .../ResourceAssigner/CMakeLists.txt                |  2 +-
 .../ResourceAssigner/bin/CMakeLists.txt            |  5 ++---
 .../ResourceAssignmentDatabase/CMakeLists.txt      | 12 ++++--------
 .../radb/sql/CMakeLists.txt                        | 12 ------------
 .../ResourceAssignmentEditor/bin/CMakeLists.txt    |  5 ++---
 .../ResourceAssignmentEditor/lib/CMakeLists.txt    | 10 +++++++++-
 .../ResourceAssignmentEstimator/CMakeLists.txt     |  5 ++---
 .../ResourceAssignmentService/CMakeLists.txt       |  5 ++---
 .../SystemStatusDatabase/sql/CMakeLists.txt        |  2 +-
 .../SystemStatusService/CMakeLists.txt             |  5 ++---
 .../TaskPrescheduler/CMakeLists.txt                |  5 ++---
 SAS/SpecificationServices/CMakeLists.txt           |  2 +-
 SAS/SpecificationServices/bin/CMakeLists.txt       |  5 ++---
 SAS/TriggerEmailService/Server/bin/CMakeLists.txt  |  5 ++---
 SAS/TriggerServices/bin/CMakeLists.txt             |  5 ++---
 SubSystems/DataManagement/CMakeLists.txt           |  5 ++---
 SubSystems/RAServices/CMakeLists.txt               |  9 ++++-----
 35 files changed, 90 insertions(+), 100 deletions(-)
 delete mode 100644 SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt

diff --git a/.gitattributes b/.gitattributes
index d48a652495e..4e72494f577 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4680,7 +4680,6 @@ SAS/ResourceAssignment/ResourceAssignmentDatabase/config.py -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/doc/ResourceAssignmentDatabase.md -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/doc/package.dox -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py -text
-SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/README -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/add_functions_and_triggers.sql -text
 SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/add_notifications.sql -text
diff --git a/Docker/CMakeLists.txt b/Docker/CMakeLists.txt
index f2afd8b1ecf..bb97e1a1c10 100644
--- a/Docker/CMakeLists.txt
+++ b/Docker/CMakeLists.txt
@@ -33,6 +33,8 @@ set(DOCKER_TEMPLATE_DIRS
 lofar_add_bin_scripts(docker-template)
 lofar_add_sbin_scripts(docker-build-all.sh)
 
+string(TOLOWER ${PACKAGE_NAME} lower_package_name)
+
 # Convert Dockerfile.tmpl -> Dockerfile in ${DOCKER_TEMPLATE_DIRS}
 foreach(_dir ${DOCKER_TEMPLATE_DIRS})
   # _src -> _dst
@@ -52,6 +54,7 @@ foreach(_dir ${DOCKER_TEMPLATE_DIRS})
   install(FILES
     ${_dst}
     DESTINATION share/docker/${_dir}
+    COMPONENT ${lower_package_name}
     RENAME Dockerfile
   )
 endforeach()
@@ -65,5 +68,6 @@ install(DIRECTORY
   lofar-outputproc
   lofar-tbbwriter
   DESTINATION share/docker
+  COMPONENT ${lower_package_name}
   USE_SOURCE_PERMISSIONS
   PATTERN Dockerfile.tmpl EXCLUDE)
diff --git a/LCS/Common/include/Common/CMakeLists.txt b/LCS/Common/include/Common/CMakeLists.txt
index f759d87e8de..3d8fcd12950 100644
--- a/LCS/Common/include/Common/CMakeLists.txt
+++ b/LCS/Common/include/Common/CMakeLists.txt
@@ -5,6 +5,8 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
 
+string(TOLOWER ${PACKAGE_NAME} lower_package_name)
+
 # Install header files.
 install(FILES 
   Allocator.h
@@ -80,18 +82,21 @@ install(FILES
   TypeNames.h
   TypeNames.tcc
   Version.h
-  DESTINATION include/${PACKAGE_NAME})
+  DESTINATION include/${PACKAGE_NAME}
+  COMPONENT ${lower_package_name})
 
 install(FILES 
   Net/FdSet.h
   Net/Socket.h
-  DESTINATION include/${PACKAGE_NAME}/Net)
+  DESTINATION include/${PACKAGE_NAME}/Net
+  COMPONENT ${lower_package_name})
 
 install(FILES
   shmem/segbasemap.h
   shmem/dlmalloc.h
   shmem/shmem_alloc.h
-  DESTINATION include/${PACKAGE_NAME}/shmem)
+  DESTINATION include/${PACKAGE_NAME}/shmem
+  COMPONENT ${lower_package_name})
 
 install(FILES
   Thread/Barrier.h
@@ -102,4 +107,5 @@ install(FILES
   Thread/Sem_t.h
   Thread/Semaphore.h
   Thread/Thread.h
-  DESTINATION include/${PACKAGE_NAME}/Thread)
+  DESTINATION include/${PACKAGE_NAME}/Thread
+  COMPONENT ${lower_package_name})
diff --git a/LCS/MessageBus/include/MessageBus/CMakeLists.txt b/LCS/MessageBus/include/MessageBus/CMakeLists.txt
index 4d5c85e09a2..b6b40c9585a 100644
--- a/LCS/MessageBus/include/MessageBus/CMakeLists.txt
+++ b/LCS/MessageBus/include/MessageBus/CMakeLists.txt
@@ -5,6 +5,8 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
 
+string(TOLOWER ${PACKAGE_NAME} lower_package_name)
+
 # Install header files.
 install(FILES
   Exceptions.h
@@ -14,12 +16,14 @@ install(FILES
   NoQpidFallback.h
   ToBus.h
   XMLDoc.h
-  DESTINATION include/${PACKAGE_NAME})
+  DESTINATION include/${PACKAGE_NAME}
+  COMPONENT ${lower_package_name})
 
 install(FILES
   Protocols/TaskFeedbackDataproducts.h
   Protocols/TaskFeedbackProcessing.h
   Protocols/TaskFeedbackState.h
   Protocols/TaskSpecificationSystem.h
-  DESTINATION include/${PACKAGE_NAME}/Protocols)
+  DESTINATION include/${PACKAGE_NAME}/Protocols
+  COMPONENT ${lower_package_name})
 
diff --git a/LCS/PyServiceSkeleton/Server/bin/CMakeLists.txt b/LCS/PyServiceSkeleton/Server/bin/CMakeLists.txt
index 37f061db1b9..b7bd06045f1 100644
--- a/LCS/PyServiceSkeleton/Server/bin/CMakeLists.txt
+++ b/LCS/PyServiceSkeleton/Server/bin/CMakeLists.txt
@@ -2,6 +2,5 @@
 lofar_add_bin_scripts(serviceskeleton)
 
 # supervisord config files
-install(FILES
-  serviceskeleton.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(serviceskeleton.ini
+  DESTINATION supervisord.d)
diff --git a/LCS/pyparameterset/src/CMakeLists.txt b/LCS/pyparameterset/src/CMakeLists.txt
index a5085bcdd31..1c8ae13cb38 100644
--- a/LCS/pyparameterset/src/CMakeLists.txt
+++ b/LCS/pyparameterset/src/CMakeLists.txt
@@ -12,11 +12,14 @@ set_target_properties(_pyparameterset PROPERTIES
   PREFIX ""
   LIBRARY_OUTPUT_DIRECTORY ${PYTHON_BUILD_DIR}/lofar/parameterset)
 
+string(TOLOWER ${PACKAGE_NAME} lower_package_name)
+
 # This is a quick-and-dirty fix to install the Python binding module in the
 # right place. It will now be installed twice, because lofar_add_library()
 # will install it in $prefix/$libdir
 install(TARGETS _pyparameterset 
-  DESTINATION ${PYTHON_INSTALL_DIR}/lofar/parameterset)
+  DESTINATION ${PYTHON_INSTALL_DIR}/lofar/parameterset
+  COMPONENT ${lower_package_name})
 
 # We only need this library because dependent packages need to link against
 # this package's version info.
diff --git a/LCS/pytools/include/pytools/CMakeLists.txt b/LCS/pytools/include/pytools/CMakeLists.txt
index 152059e1df8..dd3a158564c 100644
--- a/LCS/pytools/include/pytools/CMakeLists.txt
+++ b/LCS/pytools/include/pytools/CMakeLists.txt
@@ -5,8 +5,11 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
 
+string(TOLOWER ${PACKAGE_NAME} lower_package_name)
+
 # Install header files.
 install(FILES 
   PycExcp.h
   PycBasicData.h
-  DESTINATION include/${PACKAGE_NAME})
+  DESTINATION include/${PACKAGE_NAME}
+  COMPONENT ${lower_package_name})
diff --git a/MAC/Services/TaskManagement/Server/bin/CMakeLists.txt b/MAC/Services/TaskManagement/Server/bin/CMakeLists.txt
index 3a6a6387c56..fd360222493 100644
--- a/MAC/Services/TaskManagement/Server/bin/CMakeLists.txt
+++ b/MAC/Services/TaskManagement/Server/bin/CMakeLists.txt
@@ -2,6 +2,5 @@
 lofar_add_bin_scripts(taskmanagement)
 
 # supervisord config files
-install(FILES
-  taskmanagement.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(taskmanagement.ini
+  DESTINATION supervisord.d)
diff --git a/MAC/Services/src/CMakeLists.txt b/MAC/Services/src/CMakeLists.txt
index 0edf21396d2..0ad33f95e26 100644
--- a/MAC/Services/src/CMakeLists.txt
+++ b/MAC/Services/src/CMakeLists.txt
@@ -18,7 +18,6 @@ python_install(
 )
 
 # supervisord config files
-install(FILES
-  pipelinecontrol.ini
+lofar_add_sysconf_files(pipelinecontrol.ini
   observationcontrol2.ini
-  DESTINATION etc/supervisord.d)
+  DESTINATION supervisord.d)
diff --git a/SAS/DataManagement/Cleanup/AutoCleanupService/CMakeLists.txt b/SAS/DataManagement/Cleanup/AutoCleanupService/CMakeLists.txt
index 5f189079d72..b417dc23a5e 100644
--- a/SAS/DataManagement/Cleanup/AutoCleanupService/CMakeLists.txt
+++ b/SAS/DataManagement/Cleanup/AutoCleanupService/CMakeLists.txt
@@ -12,7 +12,6 @@ python_install(${_py_files} DESTINATION lofar/sas/datamanagement/autocleanup)
 lofar_add_bin_scripts(autocleanupservice)
 
 # supervisord config files
-install(FILES
-  autocleanupservice.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(autocleanupservice.ini
+  DESTINATION supervisord.d)
 
diff --git a/SAS/DataManagement/Cleanup/CleanupService/CMakeLists.txt b/SAS/DataManagement/Cleanup/CleanupService/CMakeLists.txt
index 16f81c0da6a..44ea9c08f52 100644
--- a/SAS/DataManagement/Cleanup/CleanupService/CMakeLists.txt
+++ b/SAS/DataManagement/Cleanup/CleanupService/CMakeLists.txt
@@ -15,7 +15,6 @@ python_install(${_py_files} DESTINATION lofar/sas/datamanagement/cleanup)
 lofar_add_bin_scripts(cleanupservice)
 
 # supervisord config files
-install(FILES
-  cleanupservice.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(cleanupservice.ini
+  DESTINATION supervisord.d)
 
diff --git a/SAS/DataManagement/StorageQueryService/CMakeLists.txt b/SAS/DataManagement/StorageQueryService/CMakeLists.txt
index d48a43ec6a1..c7e5e8b5547 100644
--- a/SAS/DataManagement/StorageQueryService/CMakeLists.txt
+++ b/SAS/DataManagement/StorageQueryService/CMakeLists.txt
@@ -19,8 +19,7 @@ python_install(${_py_files} DESTINATION lofar/sas/datamanagement/storagequery)
 lofar_add_bin_scripts(storagequery storagequeryservice)
 
 # supervisord config files
-install(FILES
-  storagequeryservice.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(storagequeryservice.ini
+  DESTINATION supervisord.d)
 
 add_subdirectory(test)
diff --git a/SAS/OTDB_Services/CMakeLists.txt b/SAS/OTDB_Services/CMakeLists.txt
index 2174576698b..e41b2fa2e3c 100644
--- a/SAS/OTDB_Services/CMakeLists.txt
+++ b/SAS/OTDB_Services/CMakeLists.txt
@@ -19,11 +19,11 @@ set(_py_files
 )
 
 # supervisord config files
-install(FILES
+lofar_add_sysconf_files(
   TreeService.ini
   TreeStatusEvents.ini
   OTDB_Services.ini
-  DESTINATION etc/supervisord.d)
+  DESTINATION supervisord.d)
 
 python_install(${_py_files} DESTINATION lofar/sas/otdb)
 
diff --git a/SAS/QPIDInfrastructure/bin/CMakeLists.txt b/SAS/QPIDInfrastructure/bin/CMakeLists.txt
index cf062009e8b..a4662f8b510 100644
--- a/SAS/QPIDInfrastructure/bin/CMakeLists.txt
+++ b/SAS/QPIDInfrastructure/bin/CMakeLists.txt
@@ -7,4 +7,4 @@ lofar_add_bin_scripts(addtoQPIDDB.py
                       gatherfrombrokers.sh
                       route_to_struct.py)
 
-install_files(/share/qpidinfrastructure/sql qpidinfra_dump.sql)
+lofar_add_data_files(qpidinfra_dump.sql DESTINATION qpidinfrastructure/sql)
diff --git a/SAS/QPIDInfrastructure/sql/CMakeLists.txt b/SAS/QPIDInfrastructure/sql/CMakeLists.txt
index 92af7c13c0d..d2cd66ec0b7 100644
--- a/SAS/QPIDInfrastructure/sql/CMakeLists.txt
+++ b/SAS/QPIDInfrastructure/sql/CMakeLists.txt
@@ -1,4 +1,3 @@
 # $Id: CMakeLists.txt 32341 2015-08-28 11:59:26Z schaap $
 
-install_files(/share/qpidinfrastructure/sql qpidinfradb.sql)
-
+lofar_add_data_files(qpidinfradb.sql DESTINATION qpidinfrastructure/sql)
diff --git a/SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/CMakeLists.txt b/SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/CMakeLists.txt
index 1e29bd04eed..043665aa813 100644
--- a/SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/CMakeLists.txt
+++ b/SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/CMakeLists.txt
@@ -15,7 +15,6 @@ python_install(${_py_files} DESTINATION lofar/sas/resourceassignment/otdbtoratas
 lofar_add_bin_scripts(otdbtorataskstatuspropagator)
 
 # supervisord config files
-install(FILES
-  otdbtorataskstatuspropagator.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(otdbtorataskstatuspropagator.ini
+                        DESTINATION supervisord.d)
 
diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/bin/CMakeLists.txt b/SAS/ResourceAssignment/RATaskSpecifiedService/bin/CMakeLists.txt
index 61bcf9738a7..a498e9c1209 100644
--- a/SAS/ResourceAssignment/RATaskSpecifiedService/bin/CMakeLists.txt
+++ b/SAS/ResourceAssignment/RATaskSpecifiedService/bin/CMakeLists.txt
@@ -5,6 +5,5 @@ lofar_add_bin_scripts(
 )
 
 # supervisord config files
-install(FILES
-  rataskspecifiedservice.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(rataskspecifiedservice.ini
+  DESTINATION supervisord.d)
diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/CMakeLists.txt b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/CMakeLists.txt
index fc5d95ef357..3b7ce295298 100644
--- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/CMakeLists.txt
+++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/CMakeLists.txt
@@ -3,7 +3,6 @@
 lofar_add_bin_scripts(rotspservice)
 
 # supervisord config files
-install(FILES
-  rotspservice.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(rotspservice.ini
+  DESTINATION supervisord.d)
 
diff --git a/SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt
index dc5f9aa8d19..471f70d701f 100644
--- a/SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt
@@ -1,6 +1,6 @@
 # $Id: CMakeLists.txt 30355 2014-11-04 13:46:05Z loose $
 
-lofar_package(ResourceAssigner 0.1 DEPENDS PyMessaging PyCommon pyparameterset OTDB_Services ResourceAssignmentService MoMQueryServiceClient ResourceAssignmentEstimator CleanupClient StorageQueryService MAC_Services MessageBus RACommon)
+lofar_package(ResourceAssigner 0.1 DEPENDS PyMessaging PyCommon pyparameterset OTDB_Services ResourceAssignmentService MoMQueryServiceClient ResourceAssignmentEstimator CleanupClient StorageQueryService MAC_Services RACommon)
 
 include(PythonInstall)
 set(USE_PYTHON_COMPILATION Off)
diff --git a/SAS/ResourceAssignment/ResourceAssigner/bin/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssigner/bin/CMakeLists.txt
index 13b5a2fc8f3..a860d72c8d5 100644
--- a/SAS/ResourceAssignment/ResourceAssigner/bin/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssigner/bin/CMakeLists.txt
@@ -3,7 +3,6 @@
 lofar_add_bin_scripts(resourceassigner)
 
 # supervisord config files
-install(FILES
-  resourceassigner.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(resourceassigner.ini
+  DESTINATION supervisord.d)
 
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentDatabase/CMakeLists.txt
index a26dc94c296..0e4b21e5fe0 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/CMakeLists.txt
@@ -18,19 +18,15 @@ python_install(${_py_files} DESTINATION lofar/sas/resourceassignment/database)
 lofar_add_bin_scripts(radbpglistener)
 
 # supervisord config files
-install(FILES
-  radbpglistener.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(radbpglistener.ini
+                        DESTINATION supervisord.d)
 
-add_subdirectory(radb/sql)
-add_subdirectory(tests)
-
-# symmetric install of sql with symlinks in build share/... and normal install in installed/share/...
 set(sql_files radb/sql/add_notifications.sql
               radb/sql/add_functions_and_triggers.sql
               radb/sql/add_resource_allocation_statics.sql
               radb/sql/add_virtual_instrument.sql
               radb/sql/create_database.sql
               radb/sql/create_and_populate_database.sql)
-
 lofar_add_data_files(${sql_files})
+
+add_subdirectory(tests)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt
deleted file mode 100644
index d0443398bad..00000000000
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Id: CMakeLists.txt 32341 2015-08-28 11:59:26Z schaap $
-
-set(sql_files add_notifications.sql
-              add_functions_and_triggers.sql
-              add_resource_allocation_statics.sql
-              add_virtual_instrument.sql
-              create_database.sql
-              create_and_populate_database.sql
-              README)
-
-install_files(/share/radb/sql FILES ${sql_files})
-
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/bin/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentEditor/bin/CMakeLists.txt
index 048414d3121..bbc683af8c4 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/bin/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/bin/CMakeLists.txt
@@ -3,7 +3,6 @@
 lofar_add_bin_scripts(raewebservice)
 
 # supervisord config files
-install(FILES
-  raewebservice.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(raewebservice.ini
+  DESTINATION supervisord.d)
 
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/CMakeLists.txt
index 3d46e35f413..9fce6bb80b9 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/CMakeLists.txt
@@ -1,5 +1,7 @@
 # $Id$
 
+string(TOLOWER ${PACKAGE_NAME} lower_package_name)
+
 python_install(
     __init__.py
     webservice.py
@@ -82,6 +84,12 @@ foreach(web_file ${web_files})
     file(MAKE_DIRECTORY ${_build_dir}/${web_file_path})
     execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${web_file_abs} ${_build_dir}/${web_file})
 
-    install(FILES ${web_file_abs} DESTINATION ${PYTHON_INSTALL_DIR}/lofar/sas/resourceassignment/resourceassignmenteditor/${web_file_path})
+    install(FILES ${web_file_abs}
+            DESTINATION ${PYTHON_INSTALL_DIR}/lofar/sas/resourceassignment/resourceassignmenteditor/${web_file_path}
+            COMPONENT ${lower_package_name})
 endforeach(web_file ${web_files})
 
+
+
+
+
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEstimator/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentEstimator/CMakeLists.txt
index 8e2a8a9173b..4e63fdec4b2 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEstimator/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssignmentEstimator/CMakeLists.txt
@@ -16,9 +16,8 @@ python_install(${_py_files} DESTINATION lofar/sas/resourceassignment/resourceass
 lofar_add_bin_scripts(raestimatorservice)
 
 # supervisord config files
-install(FILES
-  raestimatorservice.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(raestimatorservice.ini
+                        DESTINATION supervisord.d)
 
 #add_subdirectory(lib)
 add_subdirectory(test)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentService/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentService/CMakeLists.txt
index 96e34ae101c..59bb5c9dd94 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentService/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssignmentService/CMakeLists.txt
@@ -17,8 +17,7 @@ python_install(${_py_files} DESTINATION lofar/sas/resourceassignment/resourceass
 lofar_add_bin_scripts(radbservice radbclient)
 
 # supervisord config files
-install(FILES
-  radbservice.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(radbservice.ini
+                        DESTINATION supervisord.d)
 
 add_subdirectory(test)
diff --git a/SAS/ResourceAssignment/SystemStatusDatabase/sql/CMakeLists.txt b/SAS/ResourceAssignment/SystemStatusDatabase/sql/CMakeLists.txt
index e12c38bca96..6692111d0a2 100644
--- a/SAS/ResourceAssignment/SystemStatusDatabase/sql/CMakeLists.txt
+++ b/SAS/ResourceAssignment/SystemStatusDatabase/sql/CMakeLists.txt
@@ -2,5 +2,5 @@
 
 set(sql_files SetupDatabase.sql)
 
-install_files(/share/ssdb/sql FILES ${sql_files})
+lofar_add_data_files(${sql_files} DESTINATION ssdb/sql)
 
diff --git a/SAS/ResourceAssignment/SystemStatusService/CMakeLists.txt b/SAS/ResourceAssignment/SystemStatusService/CMakeLists.txt
index b075940401b..0e4bd3b6a62 100644
--- a/SAS/ResourceAssignment/SystemStatusService/CMakeLists.txt
+++ b/SAS/ResourceAssignment/SystemStatusService/CMakeLists.txt
@@ -17,8 +17,7 @@ python_install(${_py_files} DESTINATION lofar/sas/systemstatus/service)
 lofar_add_bin_scripts(ssdbservice)
 
 # supervisord config files
-install(FILES
-  ssdbservice.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(ssdbservice.ini
+                        DESTINATION supervisord.d)
 
 add_subdirectory(test)
diff --git a/SAS/ResourceAssignment/TaskPrescheduler/CMakeLists.txt b/SAS/ResourceAssignment/TaskPrescheduler/CMakeLists.txt
index 0249d035e0f..a4b4f82ac73 100644
--- a/SAS/ResourceAssignment/TaskPrescheduler/CMakeLists.txt
+++ b/SAS/ResourceAssignment/TaskPrescheduler/CMakeLists.txt
@@ -15,9 +15,8 @@ python_install(${_py_files} DESTINATION lofar/sas/resourceassignment/taskpresche
 lofar_add_bin_scripts(taskprescheduler)
 
 # supervisord config files
-install(FILES
-  taskprescheduler.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(taskprescheduler.ini
+                        DESTINATION supervisord.d)
 
 add_subdirectory(lib)
 add_subdirectory(test)
diff --git a/SAS/SpecificationServices/CMakeLists.txt b/SAS/SpecificationServices/CMakeLists.txt
index fa79dd83221..bedbd1e4a45 100644
--- a/SAS/SpecificationServices/CMakeLists.txt
+++ b/SAS/SpecificationServices/CMakeLists.txt
@@ -1,5 +1,5 @@
 lofar_find_package(Python 2.7 REQUIRED)
-lofar_package(SpecificationServices 0.1 DEPENDS PyMessaging MoMQueryService MessageBus XSD)
+lofar_package(SpecificationServices 0.1 DEPENDS PyMessaging MoMQueryService XSD)
 
 include(PythonInstall)
 
diff --git a/SAS/SpecificationServices/bin/CMakeLists.txt b/SAS/SpecificationServices/bin/CMakeLists.txt
index 8639e583a2f..c500526cfd5 100644
--- a/SAS/SpecificationServices/bin/CMakeLists.txt
+++ b/SAS/SpecificationServices/bin/CMakeLists.txt
@@ -3,8 +3,7 @@ lofar_add_bin_scripts(specificationtranslationservice)
 lofar_add_bin_scripts(specificationvalidationservice)
 
 # supervisord config files
-install(FILES
-  specificationservice.ini
+lofar_add_sysconf_files(specificationservice.ini
   specificationtranslationservice.ini
   specificationvalidationservice.ini
-  DESTINATION etc/supervisord.d)
+  DESTINATION supervisord.d)
diff --git a/SAS/TriggerEmailService/Server/bin/CMakeLists.txt b/SAS/TriggerEmailService/Server/bin/CMakeLists.txt
index b0e0ecf7353..f201c3d0076 100644
--- a/SAS/TriggerEmailService/Server/bin/CMakeLists.txt
+++ b/SAS/TriggerEmailService/Server/bin/CMakeLists.txt
@@ -2,6 +2,5 @@
 lofar_add_bin_scripts(TriggerEmailService)
 
 # supervisord config files
-install(FILES
-  TriggerEmailService.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(TriggerEmailService.ini
+  DESTINATION supervisord.d)
diff --git a/SAS/TriggerServices/bin/CMakeLists.txt b/SAS/TriggerServices/bin/CMakeLists.txt
index 1276efcecd5..8a12d41742e 100644
--- a/SAS/TriggerServices/bin/CMakeLists.txt
+++ b/SAS/TriggerServices/bin/CMakeLists.txt
@@ -3,8 +3,7 @@ lofar_add_bin_scripts(triggerservice)
 lofar_add_bin_scripts(triggercancellationservice)
 
 # supervisord config files
-install(FILES
-  triggerservice.ini
+lofar_add_sysconf_files(triggerservice.ini
   triggercancellationservice.ini
-  DESTINATION etc/supervisord.d)
+  DESTINATION supervisord.d)
 
diff --git a/SubSystems/DataManagement/CMakeLists.txt b/SubSystems/DataManagement/CMakeLists.txt
index cb7f4c1d21d..8c43cfc1080 100644
--- a/SubSystems/DataManagement/CMakeLists.txt
+++ b/SubSystems/DataManagement/CMakeLists.txt
@@ -7,6 +7,5 @@ lofar_package(DataManagement
                         ResourceTool)
 
 # supervisord config files
-install(FILES
-  DataManagement.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(DataManagement.ini
+  DESTINATION supervisord.d)
diff --git a/SubSystems/RAServices/CMakeLists.txt b/SubSystems/RAServices/CMakeLists.txt
index 631f77b6d7d..623c1768deb 100644
--- a/SubSystems/RAServices/CMakeLists.txt
+++ b/SubSystems/RAServices/CMakeLists.txt
@@ -21,10 +21,9 @@ lofar_package(RAServices
                         QPIDInfrastructure
                         RAScripts
                         StaticMetaData
-                        RACommon
-                        LSMR)
+                        RACommon)
+                        #LSMR)
 
 # supervisord config files
-install(FILES
-  RAServices.ini
-  DESTINATION etc/supervisord.d)
+lofar_add_sysconf_files(RAServices.ini
+                        DESTINATION supervisord.d)
-- 
GitLab