summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-12-08 14:07:16 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-12-08 14:07:16 (GMT)
commitcf54d8597d23141273f6e2a07f00ece959bb06e3 (patch)
treec3a1ce1e851741b52fae4a7def9dd8ff99c65713
parent47c41d902c00acd39c0af668e15bdafb591c8c43 (diff)
parentde022e8908cc5b3a6e0f179a81482fad4cfb6072 (diff)
downloadCMake-cf54d8597d23141273f6e2a07f00ece959bb06e3.zip
CMake-cf54d8597d23141273f6e2a07f00ece959bb06e3.tar.gz
CMake-cf54d8597d23141273f6e2a07f00ece959bb06e3.tar.bz2
Merge topic 'optional-latest-language-dialects'
de022e89 Add options to build CMake without latest language dialects
-rw-r--r--CMakeLists.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad3bb97..1812b27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,12 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
endif()
# Use most-recent available language dialects with GNU and Clang
-set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 14)
+if(NOT DEFINED CMAKE_C_STANDARD)
+ set(CMAKE_C_STANDARD 11)
+endif()
+if(NOT DEFINED CMAKE_CXX_STANDARD)
+ set(CMAKE_CXX_STANDARD 14)
+endif()
# option to set the internal encoding of CMake to UTF-8
option(CMAKE_ENCODING_UTF8 "Use UTF-8 encoding internally (experimental)." OFF)