diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-07-28 18:46:38 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-07-28 18:46:38 +0000 |
| commit | a498620a0640b6ea6d7200ac6d2f46040897ca42 (patch) | |
| tree | 927272567eddff0073f93686ac50421ed23008fd /cmake | |
| parent | 13bf797f8b293604a4e843fd512974208d049508 (diff) | |
| download | navit-svn-a498620a0640b6ea6d7200ac6d2f46040897ca42.tar.gz | |
Fix:Build:Make map_shapefile build again on cmake
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4662 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/navit_macros.cmake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake index 4a8dd079..446905bc 100644 --- a/cmake/navit_macros.cmake +++ b/cmake/navit_macros.cmake @@ -39,12 +39,19 @@ macro(add_plugin PLUGIN_PATH REASON ENABLE) internal_set(${PLUGIN_PATH} ${REASON} ${ENABLE}) endmacro() +# module plugins are always linked static +macro(add_module_plugin PLUGIN_PATH REASON ENABLE) + list(APPEND ALL_MODULE_PLUGINS ${PLUGIN_PATH}) + internal_set(${PLUGIN_PATH} ${REASON} ${ENABLE}) +endmacro() + macro(module_add_library MODULE_NAME ) + LINK_DIRECTORIES(${${MODULE_NAME}_LIBRARY_DIRS}) 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}) - SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS}") - + SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS} ${${MODULE_NAME}_FLAGS}") + INCLUDE_DIRECTORIES(${${MODULE_NAME}_INCLUDES}) if (USE_PLUGINS) if (ANDROID) TARGET_LINK_LIBRARIES(${MODULE_NAME} ${NAVIT_LIBNAME}) |