diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-21 13:03:55 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-21 13:03:55 (GMT) |
| commit | 26a04a684403b9d0d8a478a1ff8ec6f0fc404cb2 (patch) | |
| tree | 1e33aad2ce4809f8d0dae345039f9f2c2887d6d2 | |
| parent | db90e7c6bcd40c2cdc27232f5305800ae215ce14 (diff) | |
| parent | b5906ed03ab98b7749522d4f8211e9bcc55596c4 (diff) | |
| download | CMake-26a04a684403b9d0d8a478a1ff8ec6f0fc404cb2.zip CMake-26a04a684403b9d0d8a478a1ff8ec6f0fc404cb2.tar.gz CMake-26a04a684403b9d0d8a478a1ff8ec6f0fc404cb2.tar.bz2 | |
Merge topic 'use-std-unordered_map'
b5906ed0 Check for std::unordered_map only if we are building CMake
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a75666..1b91ab8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,9 @@ if(NOT DEFINED CMAKE_CXX_STANDARD AND NOT CMake_NO_CXX_STANDARD) set(CMAKE_CXX_STANDARD 11) endif() endif() -include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx11_unordered_map.cmake) +if(NOT CMake_TEST_EXTERNAL_CMAKE) + include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx11_unordered_map.cmake) +endif() # option to set the internal encoding of CMake to UTF-8 option(CMAKE_ENCODING_UTF8 "Use UTF-8 encoding internally." ON) |