Fix:Build:MSVC fixes|Thanks chollya
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Mon, 24 Jan 2011 16:21:49 +0000 (16:21 +0000)
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Mon, 24 Jan 2011 16:21:49 +0000 (16:21 +0000)
git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3989 ffa7fe5e-494d-0410-b361-a75ebd5db220

navit/navit/CMakeLists.txt

index 185b49e..f65f152 100644 (file)
@@ -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}")