Use global TEST_LIBS...

[simgear.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a0d6278ba35d225d2d2d8e6bf81576d228017a9..b77576cda167a3315f9e5891cf2572ffa35975c3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,6 +108,7 @@ endif()
 
 option(SIMGEAR_HEADLESS "Set to ON to build SimGear without GUI/graphics support" OFF)
 option(JPEG_FACTORY     "Enable JPEG-factory support" OFF)
+option(SG_SVN_CLIENT    "Set to ON to build SimGear with built-in SVN support" OFF)
 option(ENABLE_LIBSVN    "Set to ON to build SimGear with libsvnclient support" ON)
 option(ENABLE_RTI       "Set to ON to build SimGear with RTI support" OFF)
 option(ENABLE_TESTS     "Set to OFF to disable building SimGear's test applications" ON)
@@ -193,7 +194,9 @@ else()
     message(STATUS "JPEG-factory: DISABLED")
 endif(JPEG_FACTORY)
 
-if(ENABLE_LIBSVN)
+if (SG_SVN_CLIENT)
+    message(STATUS "Using built-in subversion client code")
+elseif(ENABLE_LIBSVN)
     find_package(SvnClient)
 
     if(LIBSVN_FOUND)
@@ -208,7 +211,7 @@ if(ENABLE_LIBSVN)
     endif(LIBSVN_FOUND)
 else()
     message(STATUS "Subversion client support: DISABLED")
-endif(ENABLE_LIBSVN)
+endif(SG_SVN_CLIENT)
 
 find_package(ZLIB REQUIRED)
 find_package(Threads REQUIRED)
@@ -317,6 +320,9 @@ if(WIN32)
         # endforeach(warning)
         
         set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /wd4996 /wd4250 -Dstrdup=_strdup")
+        if (${MSVC_VERSION} GREATER 1599)
+            set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" )
+        endif (${MSVC_VERSION} GREATER 1599)
     endif(MSVC)
     
     # assumed on Windows
@@ -328,6 +334,7 @@ endif(WIN32)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS_C} ${MSVC_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}")
 
 include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/simgear/canvas/ShivaVG/include)
@@ -372,6 +379,10 @@ if(ENABLE_TESTS)
             ${ZLIB_LIBRARY}
             ${WINSOCK_LIBRARY}
             ${RT_LIBRARY})
+        if(APPLE)
+          find_library(COCOA_LIBRARY Cocoa)
+          list(APPEND TEST_LIBS ${COCOA_LIBRARY})
+        endif()
     endif()
 
     if(NOT SIMGEAR_HEADLESS)