[Cmake-commits] CMake branch, next, updated. v3.2.2-2918-g6feef66

[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  6feef66310f6d2cfaeea7b70eed20a0307d0157e (commit)
       via  1029d38f60408ac8c3fe73530b1f889b440361b2 (commit)
      from  cc09c58ab42f812b2d72296246efbc52fb879a10 (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=6feef66310f6d2cfaeea7b70eed20a0307d0157e
commit 6feef66310f6d2cfaeea7b70eed20a0307d0157e
Merge: cc09c58 1029d38
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 18 15:12:58 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 18 15:12:58 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1029d38f60408ac8c3fe73530b1f889b440361b2
commit 1029d38f60408ac8c3fe73530b1f889b440361b2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 18 21:12:28 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon May 18 21:12:28 2015 +0200

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

diff --git a/Source/Checks/cm_cxx11_unordered_map.cmake b/Source/Checks/cm_cxx11_unordered_map.cmake
index 3e6ce88..479f4aa 100644
--- a/Source/Checks/cm_cxx11_unordered_map.cmake
+++ b/Source/Checks/cm_cxx11_unordered_map.cmake
@@ -1,23 +1,25 @@
 
-message(STATUS "Checking if compiler supports C++11 unordered_map")
-try_compile(CMake_HAVE_CXX11_UNORDERED_MAP
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_LIST_DIR}/cm_cxx11_unordered_map.cpp
-  CMAKE_FLAGS -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-  OUTPUT_VARIABLE OUTPUT
-  )
-if(CMake_HAVE_CXX11_UNORDERED_MAP)
-  message(STATUS "Checking if compiler supports C++11 unordered_map - yes")
-  file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-    "Determining if compiler supports C++11 unordered_map passed with the following output:\n"
-    "${OUTPUT}\n"
-    "\n"
-    )
-else()
-  message(STATUS "Checking if compiler supports C++11 unordered_map - no")
-  file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-    "Determining if compiler supports C++11 unordered_map failed with the following output:\n"
-    "${OUTPUT}\n"
-    "\n"
+if(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}
+    ${CMAKE_CURRENT_LIST_DIR}/cm_cxx11_unordered_map.cpp
+    CMAKE_FLAGS -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
+    OUTPUT_VARIABLE OUTPUT
     )
+  if(CMake_HAVE_CXX11_UNORDERED_MAP)
+    message(STATUS "Checking if compiler supports C++11 unordered_map - yes")
+    file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+      "Determining if compiler supports C++11 unordered_map passed with the following output:\n"
+      "${OUTPUT}\n"
+      "\n"
+      )
+  else()
+    message(STATUS "Checking if compiler supports C++11 unordered_map - no")
+    file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+      "Determining if compiler supports C++11 unordered_map failed with the following output:\n"
+      "${OUTPUT}\n"
+      "\n"
+      )
+  endif()
 endif()

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

Summary of changes:
 Source/Checks/cm_cxx11_unordered_map.cmake |   42 +++++++++++++++-------------
 1 file changed, 22 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
CMake