From e963aeeb4722af1c61647adc32751400f2807709 Mon Sep 17 00:00:00 2001
From: rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Tue, 4 Jan 2011 14:26:50 +0000
Subject: 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
---
 cmake/navit_macros.cmake | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'cmake')

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})
-- 
cgit v1.2.1