diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-18 13:28:09 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-18 14:01:48 +0100 |
| commit | adf0d48f869007e4527b00e1a346ed37ee82cc1a (patch) | |
| tree | 48a8b7cdbf60aba53e82bbffbb1199fff865238a /CMakeLists.txt | |
| parent | 8a99f39f0a5b84230bb6e764950dc674258870e8 (diff) | |
| download | audiomanager-adf0d48f869007e4527b00e1a346ed37ee82cc1a.tar.gz | |
* fix for package building with lower cmake versions
* fix DBus interface to be GLIB tolerant 32bit types
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c156fc..2bb1046 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,12 @@ OPTION( WITH_PPOLL OPTION( WITH_TELNET "build with Telnetserver" OFF) + +OPTION ( USE_BUILD_LIBS + "build with default library path = build path" ON) + +OPTION ( GLIB_DBUS_TYPES_TOLERANT + "build dbus with tolerance towards glib 16bit/32bit handling" ON) #Can be changed via passing -DDBUS_SERVICE_PREFIX="XXX" to cmake IF(NOT DEFINED DBUS_SERVICE_PREFIX) @@ -205,6 +211,7 @@ ENDFOREACH(dep) STRING(REGEX REPLACE ".$" "" dev_DEPENDENCIES ${dev_DEPENDENCIES}) list(REMOVE_DUPLICATES ALL_DEPEND) +list(REMOVE_ITEM ALL_DEPEND "audiomanager-bin") FOREACH (dep ${ALL_DEPEND}) SET(all_DEPENDENCIES "${dep} ,${all_DEPENDENCIES}") ENDFOREACH(dep) @@ -212,25 +219,36 @@ STRING(REGEX REPLACE ".$" "" all_DEPENDENCIES ${all_DEPENDENCIES}) execute_process(COMMAND cp ${CMAKE_MODULE_PATH}/add_package_dependencies.sh ${CMAKE_CURRENT_BINARY_DIR}) #component based dep package generation is only supported above 2.8.5 -IF (${CMAKE_VERSION} VERSION_GREATER 2.8.4) +IF (${CMAKE_VERSION} VERSION_GREATER 2.9.4) SET(CPACK_COMPONENTS_ALL bin sampleplugins tests dev) SET(CPACK_COMPONENTS_IGNORE_GROUPS 1) - SET(CPACK_RPM_COMPONENT_INSTALL ON) SET(CPACK_DEB_COMPONENT_INSTALL ON) ADD_CUSTOM_TARGET(genivi_package + COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=ON COMMAND make package COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux-bin.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${bin_DEPENDENCIES}\" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux-sampleplugins.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${sampleplugins_DEPENDENCIES}\" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux-tests.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${tests_DEPENDENCIES}\" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux-dev.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${dev_DEPENDENCIES}\" ) -ELSE (${CMAKE_VERSION} VERSION_GREATER 2.8.4) - ADD_CUSTOM_TARGET(genivi_package - COMMAND make package - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${all_DEPENDENCIES}\" - ) -ENDIF (${CMAKE_VERSION} VERSION_GREATER 2.8.4) +ELSE (${CMAKE_VERSION} VERSION_GREATER 2.9.4) + IF(${CMAKE_VERSION} VERSION_GREATER 2.8.3) + ADD_CUSTOM_TARGET(genivi_package + COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=ON + COMMAND make package + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${all_DEPENDENCIES}\" + ) + ELSE(${CMAKE_VERSION} VERSION_GREATER 2.8.3) + ADD_CUSTOM_TARGET(genivi_package + COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR} -DUSE_BUILD_LIBS=ON + COMMAND make package + COMMAND mkdir -p ../${CPACK_OUTPUT_FILE_PREFIX} + COMMAND mv ${CMAKE_CURRENT_BINARY_DIR}/${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux.deb ${CPACK_OUTPUT_FILE_PREFIX} + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/add_package_dependencies.sh ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Linux.deb ${CPACK_OUTPUT_FILE_PREFIX} \"${all_DEPENDENCIES}\" + ) + ENDIF(${CMAKE_VERSION} VERSION_GREATER 2.8.3) +ENDIF (${CMAKE_VERSION} VERSION_GREATER 2.9.4) INCLUDE(CPack) |