Merge topic 'use-std-unordered_map'

b5906ed0 Check for std::unordered_map only if we are building CMake
This commit is contained in:
Brad King 2015-05-21 09:03:55 -04:00 committed by CMake Topic Stage
commit 26a04a6844

View File

@ -48,7 +48,9 @@ if(NOT DEFINED CMAKE_CXX_STANDARD AND NOT CMake_NO_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 11)
endif()
endif()
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)