Merge pull request #581 from RI-SE/feature_simplify_configurations

Feature simplify configurations

CMakeLists.txt

@@ -98,10 +98,9 @@ ament_package()
 # Install configuration
 include(GNUInstallDirs)
 install(DIRECTORY launch DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/)
-file(GLOB CONF_FILES ${CMAKE_CURRENT_SOURCE_DIR}/conf/*.conf)
-file(GLOB PARAMS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/conf/*.yaml)
 file(GLOB VERSION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/.VERSION)
-install(FILES ${CONF_FILES} ${PARAMS_FILE} ${VERSION_FILE} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+install(FILES ${VERSION_FILE} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/conf/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
 
 # Add post install instructions
 add_subdirectory(cmake/cpack)

common/CMakeLists.txt

@@ -43,7 +43,6 @@ get_target_property(ISO_22133_HEADERS ${ISO_22133_LIBRARY} INCLUDE_DIRECTORIES)
 add_library(${ATOS_UTIL_TARGET} SHARED
  ${CMAKE_CURRENT_SOURCE_DIR}/util.c
  ${CMAKE_CURRENT_SOURCE_DIR}/util/coordinateutils.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/datadictionary.c
 )
 
 add_library(${ATOS_COMMON_TARGET} SHARED
@@ -108,9 +107,6 @@ set_target_properties(${ATOS_UTIL_TARGET} PROPERTIES
 set_property(TARGET ${ATOS_UTIL_TARGET} APPEND PROPERTY
  PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/util/coordinateutils.hpp
 )
-set_property(TARGET ${ATOS_UTIL_TARGET} APPEND PROPERTY
- PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/datadictionary.h
-)
 
 set_property(TARGET ${ATOS_COMMON_TARGET} APPEND PROPERTY
  PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/trajectory.hpp