[Cmake-commits] CMake branch, next, updated. v3.2.2-3026-g0dfb62a

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0dfb62aa31d17de06f118322572f3a53df6b4f30 (commit)
       via  b5906ed03ab98b7749522d4f8211e9bcc55596c4 (commit)
      from  08eed49eb94d1b9851decc0828f7b56a36a68380 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0dfb62aa31d17de06f118322572f3a53df6b4f30
commit 0dfb62aa31d17de06f118322572f3a53df6b4f30
Merge: 08eed49 b5906ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 20 11:36:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 20 11:36:00 2015 -0400

    Merge topic 'use-std-unordered_map' into next
    
    b5906ed0 Check for std::unordered_map only if we are building CMake


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5906ed03ab98b7749522d4f8211e9bcc55596c4
commit b5906ed03ab98b7749522d4f8211e9bcc55596c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 20 11:35:16 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 20 11:35:32 2015 -0400

    Check for std::unordered_map only if we are building CMake
    
    When CMake_TEST_EXTERNAL_CMAKE is set then we are not actually
    building CMake so we do not need this check.

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)

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake