From b5a4a5537063327f0a327d920bd48515cef44ce5 Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 7 Sep 2011 19:58:26 +0100 Subject: [PATCH] Cmake Windows tweaks. --- CMakeLists.txt | 2 +- simgear/threads/CMakeLists.txt | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 055f915c..de222a92 100644 --- 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 9eb4d540..5258be8f 100644 --- 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}") -- 2.39.5