From 63be7f57888467a1d8afe90136c9dd435a2a7278 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Tue, 9 Dec 2014 18:58:37 +0100 Subject: * shift config.h file to build directory - just make it cleaner * change order of compilation - include projectspecific stuff earlier now * make dynamic ID boundary setable via cmake Signed-off-by: Christian Linke --- AudioManagerDaemon/include/IAmDatabaseHandler.h | 3 ++- CMakeLists.txt | 32 +++++++++++++------------ cmake/config.cmake | 2 ++ 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/AudioManagerDaemon/include/IAmDatabaseHandler.h b/AudioManagerDaemon/include/IAmDatabaseHandler.h index e053635..ba387e2 100644 --- a/AudioManagerDaemon/include/IAmDatabaseHandler.h +++ b/AudioManagerDaemon/include/IAmDatabaseHandler.h @@ -28,6 +28,7 @@ #include #include #include +#include "config.h" namespace am { @@ -37,7 +38,7 @@ class CAmRoutingTree; class CAmRoutingTreeItem; -enum { DYNAMIC_ID_BOUNDARY = 100 }; //!< the value below is reserved for staticIDs, the value above will be assigned to dynamically registered items +//enum { DYNAMIC_ID_BOUNDARY = 100 }; //!< the value below is reserved for staticIDs, the value above will be assigned to dynamically registered items //todo: check the enum values before entering & changing in the database. //todo: change asserts for dynamic boundary checks into failure answers.# diff --git a/CMakeLists.txt b/CMakeLists.txt index 49e0afc..72fd3da 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,6 +166,8 @@ IF(NOT DEFINED NSM_INTERFACE) SET( NSM_INTERFACE "org.genivi.NodeStateManager.Consumer") ENDIF(NOT DEFINED NSM_INTERFACE) +SET(DYNAMIC_ID_BOUNDARY 100 CACHE INTEGER "The ID boundary between static and dynamic ID ranges") + SET(PLUGINS_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/plugins) SET(LIB_INSTALL_SUFFIX "audioManager") @@ -195,6 +197,8 @@ IF(EXISTS "ProjectSpecific/") SET(PROJECT_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/ProjectSpecific/include) endif(EXISTS "ProjectSpecific/") +SET(PROJECT_INCLUDE_FOLDER ${PROJECT_INCLUDE_FOLDER} ${CMAKE_BINARY_DIR}/include) + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) SET(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/include) SET(DOC_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/doc) @@ -215,20 +219,13 @@ IF(WITH_TESTS) set(GOOGLE_TEST_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/googleMock/gtest/include") ENDIF(WITH_TESTS) -IF(WITH_DOCUMENTATION) - find_package(Doxygen) - configure_file(${DOXY_FILE} ${DOC_OUTPUT_PATH}/Doxyfile @ONLY IMMEDIATE) - configure_file("README.html" ${DOC_OUTPUT_PATH}/html/README.html) - add_custom_target (AudioManangerDoku ALL - COMMAND ${DOXYGEN_EXECUTABLE} ${DOC_OUTPUT_PATH}/Doxyfile WORKING_DIRECTORY ${DOC_OUTPUT_PATH} - SOURCES ${CMAKE_SOURCE_DIR} ${DOC_OUTPUT_PATH}/Doxyfile - ) -ENDIF(WITH_DOCUMENTATION) - ##global build flags set(CPACK_RPM_COMPONENT_INSTALL ON) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -std=gnu++0x -D_GNU_SOURCE -pedantic -Wno-variadic-macros -Wno-long-long -Wno-unused-parameter") #set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -std=c++98 -D_GNU_SOURCE") +IF(EXISTS "${CMAKE_SOURCE_DIR}/ProjectSpecific/") + add_subdirectory (ProjectSpecific) +endif(EXISTS "${CMAKE_SOURCE_DIR}/ProjectSpecific/") if(WITH_PLUGIN_COMMAND) if(WITH_DBUS_WRAPPER) @@ -253,11 +250,6 @@ endif(WITH_PLUGIN_CONTROL) add_subdirectory (AudioManagerDaemon) - -IF(EXISTS "${CMAKE_SOURCE_DIR}/ProjectSpecific/") - add_subdirectory (ProjectSpecific) -endif(EXISTS "${CMAKE_SOURCE_DIR}/ProjectSpecific/") - # uninstall target configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" @@ -266,6 +258,16 @@ configure_file( add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) + + IF(WITH_DOCUMENTATION) + find_package(Doxygen) + configure_file(${DOXY_FILE} ${DOC_OUTPUT_PATH}/Doxyfile @ONLY IMMEDIATE) + configure_file("README.html" ${DOC_OUTPUT_PATH}/html/README.html) + add_custom_target (AudioManangerDoku ALL + COMMAND ${DOXYGEN_EXECUTABLE} ${DOC_OUTPUT_PATH}/Doxyfile WORKING_DIRECTORY ${DOC_OUTPUT_PATH} + SOURCES ${CMAKE_SOURCE_DIR} ${DOC_OUTPUT_PATH}/Doxyfile + ) +ENDIF(WITH_DOCUMENTATION) # Here starts package creation SET(CPACK_SET_DESTDIR ON) diff --git a/cmake/config.cmake b/cmake/config.cmake index d2fac30..107719a 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -32,4 +32,6 @@ #cmakedefine NSM_INTERFACE "@NSM_INTERFACE@" #cmakedefine NSM_INTROSPECTION_FILE "@NSM_INTROSPECTION_FILE@" +enum { DYNAMIC_ID_BOUNDARY = @DYNAMIC_ID_BOUNDARY@ }; + #endif /* _CONFIG_H */ -- cgit v1.2.1