summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-03-15 00:47:00 +0000
committerrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-03-15 00:47:00 +0000
commitd152fb05c50da0ad7608ba4b1bd7eaa6ec904b2e (patch)
tree90c51e1df2bc0050f82f5f4ba80899a192f36815 /cmake
parentd05eb81f172dcd30cb44a00aa38d7fe0aa064504 (diff)
downloadnavit-d152fb05c50da0ad7608ba4b1bd7eaa6ec904b2e.tar.gz
Fix:build/cmake:Fixed some linkage dependency. Should also fix maptool linker errors on mingw with installed libint.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4346 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'cmake')
-rw-r--r--cmake/navit_macros.cmake14
1 files changed, 6 insertions, 8 deletions
diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake
index 08647e2ac..8e6ed62d4 100644
--- a/cmake/navit_macros.cmake
+++ b/cmake/navit_macros.cmake
@@ -44,27 +44,25 @@ macro(module_add_library MODULE_NAME )
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}")
-
+
if (USE_PLUGINS)
-
# workaround to be compatible with old paths
set_target_properties( ${MODULE_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.libs")
- if (ANDROID)
- TARGET_LINK_LIBRARIES(${MODULE_NAME} navit)
- endif()
install(TARGETS ${MODULE_NAME}
DESTINATION ${LIB_DIR}/navit/${${MODULE_NAME}_TYPE}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ else()
+ TARGET_LINK_LIBRARIES(${MODULE_NAME} ${NAVIT_LIBNAME})
endif()
endmacro(module_add_library)
macro(supportlib_add_library LIB_NAME )
add_library(${LIB_NAME} ${ARGN})
SET_TARGET_PROPERTIES( ${LIB_NAME} PROPERTIES COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS}")
- if (USE_PLUGINS)
- TARGET_LINK_LIBRARIES(${MODULE_NAME} navit_core)
- endif()
+ if (NOT USE_PLUGINS)
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${NAVIT_LIBNAME})
+ endif(NOT USE_PLUGINS)
endmacro(supportlib_add_library)
macro(message_error)