Fix:Build:Made compileable on macosx

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

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index af0ae5a..dac1256 100644 (file)
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -180,7 +180,7 @@ if(FREETYPE_FOUND)
    pkg_check_modules(FRIBIDI fribidi)
    pkg_check_modules(FRIBIDI2 fribidi>=0.19.0)
    include_directories(${FREETYPE_INCLUDE_DIRS})
-   set_with_reason(font/freetype "freetype found" TRUE "${FREETYPE_LIBRARY};${FONTCONFIG_LIBRARIES};${FRIBIDI_LIBRARIES}")
+   set_with_reason(font/freetype "freetype found" TRUE "${FREETYPE_LIBRARY};${FONTCONFIG_LDFLAGS};${FRIBIDI_LIBRARIES}")
 else(FREETYPE_FOUND)
    MESSAGE("No freetype library found, graphics modules may not be available")
    set_with_reason(graphics/android "FreeType library not found" FALSE)
@@ -243,7 +243,7 @@ if(SDL_FOUND AND SDLIMAGE_FOUND AND FREETYPE_FOUND)
 endif(SDL_FOUND AND SDLIMAGE_FOUND AND FREETYPE_FOUND)
 
 if (LIBGPS_FOUND)
-   set_with_reason(vehicle/gpsd "gpsd lib found" TRUE ${LIBGPS_LIBRARIES})
+   set_with_reason(vehicle/gpsd "gpsd lib found" TRUE ${LIBGPS_LDFLAGS})
 endif(LIBGPS_FOUND)
 
 if (GYPSY_FOUND)

diff --git a/navit/cmake/navit_macros.cmake b/navit/cmake/navit_macros.cmake
index df3f45d..4a8dd07 100644 (file)
--- a/navit/cmake/navit_macros.cmake
+++ b/navit/cmake/navit_macros.cmake
@@ -49,6 +49,9 @@ macro(module_add_library MODULE_NAME )
        if (ANDROID)
            TARGET_LINK_LIBRARIES(${MODULE_NAME} ${NAVIT_LIBNAME})
        endif()
+       if (APPLE)
+           set_target_properties( ${MODULE_NAME} PROPERTIES LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup") 
+       endif()
       # workaround to be compatible with old paths
       set_target_properties( ${MODULE_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.libs")