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-04-04 17:30:25 (GMT)
commitf4b9c6bbebb0757db2b87efd2239a8eb44d24092 (patch)
tree9227bef5adcc79a88fc21c8cd9192275f2f51dd3
parent358be9b3207ad92a7ce4a5744db6a7265d8a0844 (diff)
downloadCMake-f4b9c6bbebb0757db2b87efd2239a8eb44d24092.zip
CMake-f4b9c6bbebb0757db2b87efd2239a8eb44d24092.tar.gz
CMake-f4b9c6bbebb0757db2b87efd2239a8eb44d24092.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)