Cmake Windows tweaks.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 055f915c4c5d1fe3c58174c29a45fa78f96c7c10..de222a924e68ee279f4bb7d10480c94260c82edc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,7 +157,7 @@ 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")
+        set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /wd4996")
     endif(MSVC)
     
     # assumed on Windows

diff --git a/simgear/threads/CMakeLists.txt b/simgear/threads/CMakeLists.txt
index 9eb4d5407b3e2fe594ba8b362e5264e655502f2f..5258be8f70a3534fe2909525642aa9238d05be59 100644 (file)
--- a/simgear/threads/CMakeLists.txt
+++ b/simgear/threads/CMakeLists.txt
@@ -5,10 +5,5 @@ set(HEADERS
     SGQueue.hxx
     SGThread.hxx)
 
-
-if (MSVC)
-  install (FILES ${HEADERS}  DESTINATION include/simgear/threads)
-else (MSVC)
-  set(SOURCES SGThread.cxx)
-  simgear_component(threads threads "${SOURCES}" "${HEADERS}")
-endif(MSVC)
+set(SOURCES SGThread.cxx)
+simgear_component(threads threads "${SOURCES}" "${HEADERS}")