summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2014-04-03 17:02:01 (GMT)
committerBrad King <brad.king@kitware.com>2014-05-06 17:23:51 (GMT)
commit4ca9b0086f4982f9bfc6e5f3e6265db84f95b616 (patch)
tree895f526989cf5e4104428f295038fbfb234b8e64
parentc553d68798b277506efc361f70987c81fea55fec (diff)
downloadCMake-4ca9b0086f4982f9bfc6e5f3e6265db84f95b616.zip
CMake-4ca9b0086f4982f9bfc6e5f3e6265db84f95b616.tar.gz
CMake-4ca9b0086f4982f9bfc6e5f3e6265db84f95b616.tar.bz2
CompileFlags: Test for C++ features after selecting flags
Some flags we select may affect availability of C++ features.
-rw-r--r--CompileFlags.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 24ac58d..332d742 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -19,7 +19,6 @@ endif()
if(CMAKE_GENERATOR MATCHES "Visual Studio 6")
set(CMAKE_SKIP_COMPATIBILITY_TESTS 1)
endif()
-include (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
set(_INTEL_WINDOWS 1)
@@ -68,3 +67,5 @@ endif ()
if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*")
endif ()
+
+include (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)