diff options
author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-07-17 20:12:28 +0000 |
---|---|---|
committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-07-17 20:12:28 +0000 |
commit | 81701c08aba98cf62505a9f8d59881efd98a42fd (patch) | |
tree | fddfc28d8b71f0c047aefd5a745da2ecddc15a79 | |
parent | 054945b22a650a4062855dbc7011f726debfcc83 (diff) | |
download | navit-svn-81701c08aba98cf62505a9f8d59881efd98a42fd.tar.gz |
Fix:Build:Made compileable on macosx
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4641 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | cmake/navit_macros.cmake | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index af0ae5a9..dac12565 100644 --- a/CMakeLists.txt +++ b/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/cmake/navit_macros.cmake b/cmake/navit_macros.cmake index df3f45de..4a8dd079 100644 --- a/cmake/navit_macros.cmake +++ b/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") |