summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-03-12 19:26:31 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-03-12 19:26:31 (GMT)
commitdfeeda3778e4b436add8ad95a1c9daab52309901 (patch)
tree69030c19b8c584baea4259e7309bcdb7a9b790fc
parent119f45ce2a7209739f79d93a63c4d029c459bbb3 (diff)
parent77534e84b27701e371ccee780be5acffe7cced59 (diff)
downloadCMake-dfeeda3778e4b436add8ad95a1c9daab52309901.zip
CMake-dfeeda3778e4b436add8ad95a1c9daab52309901.tar.gz
CMake-dfeeda3778e4b436add8ad95a1c9daab52309901.tar.bz2
Merge topic 'allow-no-language-standard'
77534e84 Add options to build CMake without any language dialects
-rw-r--r--CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1250a94..d86ae96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,10 +37,10 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
endif()
# Use most-recent available language dialects with GNU and Clang
-if(NOT DEFINED CMAKE_C_STANDARD)
+if(NOT DEFINED CMAKE_C_STANDARD AND NOT CMake_NO_C_STANDARD)
set(CMAKE_C_STANDARD 11)
endif()
-if(NOT DEFINED CMAKE_CXX_STANDARD)
+if(NOT DEFINED CMAKE_CXX_STANDARD AND NOT CMake_NO_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
endif()