From 5631c46c68080cf1af3a852533afcd28445a5b69 Mon Sep 17 00:00:00 2001 From: rikky Date: Wed, 5 Jan 2011 13:01:30 +0000 Subject: Add:Build:Add more infos to cmake summary git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3863 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- cmake/navit_macros.cmake | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'cmake') diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake index 432839be..af25aae1 100644 --- a/cmake/navit_macros.cmake +++ b/cmake/navit_macros.cmake @@ -5,6 +5,17 @@ macro(set_with_reason VARIABLE REASON ENABLE) set(${VARIABLE_NAMES}_LIBS ${ARGN}) endmacro() +macro(add_feature FEATURE REASON ENABLE) + list(APPEND ALL_FEATURES ${FEATURE}) + set(${FEATURE} ${ENABLE}) + set(${FEATURE}_REASON ${REASON}) +endmacro() + +macro(cfg_feature FEATURE REASON ENABLE) + set(${FEATURE} ${ENABLE}) + set(${FEATURE}_REASON ${REASON}) +endmacro() + # modules may be linked static, or shared for import at runtime macro(add_module MODULE_PATH REASON) list(APPEND ALL_MODULES ${MODULE_PATH}) @@ -20,16 +31,16 @@ macro(add_plugin PLUGIN_PATH REASON) endmacro() macro(module_add_library MODULE_NAME ) - add_library(${MODULE_NAME} ${MODULE_BUILD_TYPE} ${ARGN}) + add_library(${MODULE_NAME} ${MODULE_BUILD_TYPE} ${ARGN}) SET_TARGET_PROPERTIES(${MODULE_NAME} PROPERTIES COMPILE_DEFINITIONS "MODULE=${MODULE_NAME}") TARGET_LINK_LIBRARIES(${MODULE_NAME} ${${MODULE_NAME}_LIBS}) - + if (USE_PLUGINS) SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES COMPILE_FLAGS ${NAVIT_COMPILE_FLAGS}) - + # workaround to be compatible with old paths set_target_properties( ${MODULE_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.libs") - + TARGET_LINK_LIBRARIES(${MODULE_NAME} navit_core) install(TARGETS ${MODULE_NAME} DESTINATION ${LIB_DIR}/navit/${${MODULE_NAME}_TYPE} @@ -38,7 +49,7 @@ macro(module_add_library MODULE_NAME ) endmacro(module_add_library) macro(supportlib_add_library LIB_NAME ) - add_library(${LIB_NAME} ${ARGN}) + add_library(${LIB_NAME} ${ARGN}) if (USE_PLUGINS) SET_TARGET_PROPERTIES( ${LIB_NAME} PROPERTIES COMPILE_FLAGS ${NAVIT_COMPILE_FLAGS}) TARGET_LINK_LIBRARIES(${MODULE_NAME} navit_core) -- cgit v1.2.1