Fix:build/cmake:Remove some unneeded link dependencies

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4464 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index 3625360..5e88727 100644 (file)
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -108,6 +108,7 @@ else()
    CHECK_LIBRARY_EXISTS(intl libintl_fprintf "" NEEDS_LIBINTL)
    if (NEEDS_LIBINTL)
       list(APPEND NAVIT_LIBS intl)
+      set(INTL_LIBS intl)
    endif(NEEDS_LIBINTL)
 endif(NOT HAVE_LIBINTL)
 
@@ -122,7 +123,7 @@ if (Glib_FOUND)
    include_directories(${Glib_INCLUDE_DIRS})
    list(APPEND NAVIT_LIBS ${Glib_LIBRARIES})
 else(Glib_FOUND)
-   set_with_reason(support/glib "Glib not found" TRUE)
+   set_with_reason(support/glib "Glib not found" TRUE ${INTL_LIBS})
 endif(Glib_FOUND)
 if (Gmodule_FOUND)
    set(HAVE_GMODULE 1)

diff --git a/navit/cmake/navit_macros.cmake b/navit/cmake/navit_macros.cmake
index 09b9658..df3f45d 100644 (file)
--- a/navit/cmake/navit_macros.cmake
+++ b/navit/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)