diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-05-02 20:06:09 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-05-02 20:06:09 +0000 |
| commit | 2fd30a797cc2c2952910ce96e846ffbe084a2ec9 (patch) | |
| tree | edb72b7b8110569891dda61ffbbc2996b4392a85 /cmake | |
| parent | 672ef7296712457d3dbcdc48af77af46b269716d (diff) | |
| download | navit-2fd30a797cc2c2952910ce96e846ffbe084a2ec9.tar.gz | |
Fix:build/cmake:Remove some unneeded link dependencies
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4464 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/navit_macros.cmake | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake index 09b965898..df3f45de2 100644 --- a/cmake/navit_macros.cmake +++ b/cmake/navit_macros.cmake @@ -45,27 +45,23 @@ macro(module_add_library MODULE_NAME ) TARGET_LINK_LIBRARIES(${MODULE_NAME} ${${MODULE_NAME}_LIBS}) SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS}") - if (ANDROID) - TARGET_LINK_LIBRARIES(${MODULE_NAME} ${NAVIT_LIBNAME}) - endif() if (USE_PLUGINS) + if (ANDROID) + TARGET_LINK_LIBRARIES(${MODULE_NAME} ${NAVIT_LIBNAME}) + endif() # workaround to be compatible with old paths set_target_properties( ${MODULE_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.libs") 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}) + TARGET_LINK_LIBRARIES(${LIB_NAME} ${${LIB_NAME}_LIBS}) SET_TARGET_PROPERTIES( ${LIB_NAME} PROPERTIES COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS}") - if (NOT USE_PLUGINS) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${NAVIT_LIBNAME}) - endif(NOT USE_PLUGINS) endmacro(supportlib_add_library) macro(message_error) |