From 14cb0cc8501af014118b3e7eee63a0a9e88b1b15 Mon Sep 17 00:00:00 2001 From: martin-s Date: Mon, 24 Jan 2011 16:21:49 +0000 Subject: [PATCH] Fix:Build:MSVC fixes|Thanks chollya git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3989 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/navit/navit/CMakeLists.txt b/navit/navit/CMakeLists.txt index 185b49e..f65f152 100644 --- a/navit/navit/CMakeLists.txt +++ b/navit/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}") -- 2.7.4