diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-04 14:26:50 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-04 14:26:50 +0000 |
| commit | e963aeeb4722af1c61647adc32751400f2807709 (patch) | |
| tree | 2878f343085a437b1281730c1d9ea25a14b577c8 /cmake | |
| parent | f60d0e3749b7e20175543b96a90c4f45771e0b77 (diff) | |
| download | navit-svn-e963aeeb4722af1c61647adc32751400f2807709.tar.gz | |
Fix:Build:Fix cmake build to link external libraries to plugins/modules which depend on it, not to navit_core.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3858 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/navit_macros.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake index 0f4ef09f..432839be 100644 --- a/cmake/navit_macros.cmake +++ b/cmake/navit_macros.cmake @@ -1,6 +1,8 @@ -macro(set_with_reason VARIABLE REASON) - set(${VARIABLE} ${ARGN}) +macro(set_with_reason VARIABLE REASON ENABLE) + set(${VARIABLE} ${ENABLE}) set(${VARIABLE}_REASON ${REASON}) + string(REPLACE "/" "_" VARIABLE_NAMES ${VARIABLE}) + set(${VARIABLE_NAMES}_LIBS ${ARGN}) endmacro() # modules may be linked static, or shared for import at runtime @@ -20,6 +22,7 @@ endmacro() macro(module_add_library MODULE_NAME ) 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}) |