diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-24 16:21:49 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-24 16:21:49 +0000 |
| commit | ace6b57dbad31d16c11a2a3db3670cdf317f0d53 (patch) | |
| tree | 0e2f455c852e4c7e481835b0e31590bed2b7be46 /navit/CMakeLists.txt | |
| parent | 09b11bfca1ecb312349141b4b448f9810028cd93 (diff) | |
| download | navit-ace6b57dbad31d16c11a2a3db3670cdf317f0d53.tar.gz | |
Fix:Build:MSVC fixes|Thanks chollya
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3989 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/CMakeLists.txt')
| -rw-r--r-- | navit/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index 185b49ede..f65f152ef 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -72,7 +72,10 @@ if (SHARED_LIBNAVIT) else(SHARED_LIBNAVIT) add_library (${NAVIT_LIBNAME} STATIC ${NAVIT_SRC} ) endif(SHARED_LIBNAVIT) -target_link_libraries(${NAVIT_LIBNAME} ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} fib ${NAVIT_LIBS} m) +if(NOT MSVC) + SET(NAVIT_LIBS ${NAVIT_LIBS} m) +endif(NOT MSVC) +target_link_libraries(${NAVIT_LIBNAME} ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} fib ${NAVIT_LIBS} ) set_target_properties(${NAVIT_LIBNAME} PROPERTIES COMPILE_DEFINITIONS "MODULE=navit;LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}\";PREFIX=\"${CMAKE_INSTALL_PREFIX}\"") if (DEFINED NAVIT_COMPILE_FLAGS) set_target_properties(${NAVIT_LIBNAME} PROPERTIES COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS}") |