From a498620a0640b6ea6d7200ac6d2f46040897ca42 Mon Sep 17 00:00:00 2001
From: martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Thu, 28 Jul 2011 18:46:38 +0000
Subject: 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
---
 cmake/navit_macros.cmake | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'cmake/navit_macros.cmake')

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