X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=854db0c9e4552a186ab57b7696fe0ab6663c0b7d;hb=848965e7f07c0da4bb5f15674c9501fcfa37cd18;hp=00ff37b30f317e800122f92f2e7f3cd9c42261a3;hpb=439041c2f4e10bd8197a5d79d0b0ffb3de52e866;p=simgear.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00ff37b3..854db0c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,10 +112,9 @@ option(ENABLE_LIBSVN    "Set to ON to build SimGear with libsvnclient support" O
 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)
 option(ENABLE_SOUND     "Set to OFF to disable building SimGear's sound support" ON)
-option(ENABLE_PACKAGE   "Set to ON to build package-management support" ON)
 
 if (MSVC)
-  GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
+  GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} PATH)
   if (CMAKE_CL_64)
     SET(TEST_3RDPARTY_DIR "${PARENT_DIR}/3rdparty.x64")
   else (CMAKE_CL_64)
@@ -224,12 +223,6 @@ else()
     add_definitions(-DHAVE_EXPAT_CONFIG_H)
 endif(SYSTEM_EXPAT)
 
-if (ENABLE_PACKAGE)
-    message(STATUS "package management: ENABLED")
-else()
-    message(STATUS "package management: DISABLED")
-endif(ENABLE_PACKAGE)
-
 check_include_file(inttypes.h HAVE_INTTYPES_H)
 check_include_file(sys/time.h HAVE_SYS_TIME_H)
 check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H)
@@ -323,7 +316,10 @@ if(WIN32)
         #     SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}")
         # endforeach(warning)
         
-        set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /wd4996 /wd4250")
+        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
@@ -335,6 +331,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)
@@ -367,7 +364,26 @@ if(ENABLE_TESTS)
     message(STATUS "Tests: ENABLED")
 
     include (Dart)
-        enable_testing()
+    enable_testing()
+
+    if(SIMGEAR_SHARED)
+        set( TEST_LIBS
+            SimGearCore)
+    else()
+        set( TEST_LIBS
+            SimGearCore
+            ${CMAKE_THREAD_LIBS_INIT}
+            ${ZLIB_LIBRARY}
+            ${WINSOCK_LIBRARY}
+            ${RT_LIBRARY})
+    endif()
+
+    if(NOT SIMGEAR_HEADLESS)
+        set( TEST_LIBS
+            SimGearScene
+            ${TEST_LIBS}
+            ${OPENGL_LIBRARIES})
+    endif()
 else()
     message(STATUS "Tests: DISABLED")
 endif(ENABLE_TESTS)