diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cmake/navit_macros.cmake | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 362536061..5e887275b 100644 --- a/CMakeLists.txt +++ b/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/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) |