[Cmake-commits] CMake branch, next, updated. v3.6.2-2129-gf9224eb

[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  f9224eb7b28c6c6456524906103e7f26b5afe17e (commit)
       via  aa50cdac439121f9e40ff2638368dc913a0e2361 (commit)
      from  5991d310b7b631ab0716bfb9e182260fe836bd60 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9224eb7b28c6c6456524906103e7f26b5afe17e
commit f9224eb7b28c6c6456524906103e7f26b5afe17e
Merge: 5991d31 aa50cda
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 16 13:25:05 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 16 13:25:05 2016 -0400

    Merge topic 'check-for-unique_ptr' into next
    
    aa50cdac Check for availability of unique_ptr and make_unique when building CMake


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa50cdac439121f9e40ff2638368dc913a0e2361
commit aa50cdac439121f9e40ff2638368dc913a0e2361
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 16 13:21:10 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 16 13:22:10 2016 -0400

    Check for availability of unique_ptr and make_unique when building CMake
    
    Some code paths may find these useful if available.

diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake
index 6fde7b6..c6a532f 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -32,8 +32,13 @@ function(cm_check_cxx_feature name)
 endfunction()
 
 if(CMAKE_CXX_STANDARD)
+  cm_check_cxx_feature(make_unique)
+  if(CMake_HAVE_CXX_MAKE_UNIQUE)
+    set(CMake_HAVE_CXX_UNIQUE_PTR 1)
+  endif()
   cm_check_cxx_feature(nullptr)
   cm_check_cxx_feature(override)
+  cm_check_cxx_feature(unique_ptr)
   cm_check_cxx_feature(unordered_map)
   cm_check_cxx_feature(unordered_set)
 endif()
diff --git a/Source/Checks/cm_cxx_make_unique.cxx b/Source/Checks/cm_cxx_make_unique.cxx
new file mode 100644
index 0000000..a3ff68f
--- /dev/null
+++ b/Source/Checks/cm_cxx_make_unique.cxx
@@ -0,0 +1,6 @@
+#include <memory>
+int main()
+{
+  std::unique_ptr<int> u = std::make_unique<int>(0);
+  return *u;
+}
diff --git a/Source/Checks/cm_cxx_unique_ptr.cxx b/Source/Checks/cm_cxx_unique_ptr.cxx
new file mode 100644
index 0000000..a9d4ce5
--- /dev/null
+++ b/Source/Checks/cm_cxx_unique_ptr.cxx
@@ -0,0 +1,6 @@
+#include <memory>
+int main()
+{
+  std::unique_ptr<int> u(new int(0));
+  return *u;
+}
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index ccea22d..8365367 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -30,8 +30,10 @@
 #cmakedefine CMAKE_USE_MACH_PARSER
 #cmakedefine CMAKE_USE_LIBUV
 #cmakedefine CMAKE_ENCODING_UTF8
+#cmakedefine CMake_HAVE_CXX_MAKE_UNIQUE
 #cmakedefine CMake_HAVE_CXX_NULLPTR
 #cmakedefine CMake_HAVE_CXX_OVERRIDE
+#cmakedefine CMake_HAVE_CXX_UNIQUE_PTR
 #cmakedefine CMake_HAVE_CXX_UNORDERED_MAP
 #cmakedefine CMake_HAVE_CXX_UNORDERED_SET
 #define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@"

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

Summary of changes:


hooks/post-receive
-- 
CMake