[Cmake-commits] CMake branch, next, updated. v3.2.2-2937-g52db3de

[Stephen Kelly]

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  52db3de85d7df7a71d3348363a64a0c0406c1c14 (commit)
       via  9b6cf1d013e8ebdc33728fc78af011f39b6fbe6c (commit)
      from  10b353d5796d2ba4b4c79a06e3c6a5ad38df155f (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=52db3de85d7df7a71d3348363a64a0c0406c1c14
commit 52db3de85d7df7a71d3348363a64a0c0406c1c14
Merge: 10b353d 9b6cf1d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 18 18:06:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 18 18:06:52 2015 -0400

    Merge topic 'use-std-unordered_map' into next
    
    9b6cf1d0 fixup! Use std::unordered_map instead of hash_map where available.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b6cf1d013e8ebdc33728fc78af011f39b6fbe6c
commit 9b6cf1d013e8ebdc33728fc78af011f39b6fbe6c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 19 00:04:48 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 19 00:04:48 2015 +0200

    fixup! Use std::unordered_map instead of hash_map where available.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c3dba4..5a75666 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,8 +47,8 @@ if(NOT DEFINED CMAKE_CXX_STANDARD AND NOT CMake_NO_CXX_STANDARD)
   else()
     set(CMAKE_CXX_STANDARD 11)
   endif()
-  include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx11_unordered_map.cmake)
 endif()
+include(${CMake_SOURCE_DIR}/Source/Checks/cm_cxx11_unordered_map.cmake)
 
 # option to set the internal encoding of CMake to UTF-8
 option(CMAKE_ENCODING_UTF8 "Use UTF-8 encoding internally." ON)
diff --git a/Source/Checks/cm_cxx11_unordered_map.cmake b/Source/Checks/cm_cxx11_unordered_map.cmake
index 479f4aa..80fe391 100644
--- a/Source/Checks/cm_cxx11_unordered_map.cmake
+++ b/Source/Checks/cm_cxx11_unordered_map.cmake
@@ -1,5 +1,5 @@
 
-if(NOT DEFINED CMake_HAVE_CXX11_UNORDERED_MAP)
+if(CMAKE_CXX_STANDARD AND NOT DEFINED CMake_HAVE_CXX11_UNORDERED_MAP)
   message(STATUS "Checking if compiler supports C++11 unordered_map")
   try_compile(CMake_HAVE_CXX11_UNORDERED_MAP
     ${CMAKE_CURRENT_BINARY_DIR}

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

Summary of changes:
 CMakeLists.txt                             |    2 +-
 Source/Checks/cm_cxx11_unordered_map.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake