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  f5db532193c0e1396286ba4bb796f4be38e3a420 (commit)
       via  58a3e2d186d1a7c94d1a94ae0cc9b80c86c57aa2 (commit)
      from  b9ddf9801cb6b481ed076aa63b7dc8e619633115 (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=f5db532193c0e1396286ba4bb796f4be38e3a420
commit f5db532193c0e1396286ba4bb796f4be38e3a420
Merge: b9ddf98 58a3e2d
Author:     Brad King <brad.k...@kitware.com>
AuthorDate: Fri Sep 16 13:07:38 2016 -0400
Commit:     CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Sep 16 13:07:38 2016 -0400

    Merge topic 'cmake-server-basic' into next
    
    58a3e2d1 fixup! cmake-server: Bare-bones server implementation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58a3e2d186d1a7c94d1a94ae0cc9b80c86c57aa2
commit 58a3e2d186d1a7c94d1a94ae0cc9b80c86c57aa2
Author:     Brad King <brad.k...@kitware.com>
AuthorDate: Fri Sep 16 13:04:16 2016 -0400
Commit:     Brad King <brad.k...@kitware.com>
CommitDate: Fri Sep 16 13:04:16 2016 -0400

    fixup! cmake-server: Bare-bones server implementation

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce76316..08853c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -708,10 +708,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE AND NOT CMAKE_BOOTSTRAP 
AND CMAKE_USE_LIBUV)
   list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_auto_type CMake_HAVE_CXX_AUTO_TYPE)
   list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_range_for CMake_HAVE_CXX_RANGE_FOR)
   if(CMake_HAVE_CXX_AUTO_TYPE AND CMake_HAVE_CXX_RANGE_FOR)
-    include(CheckCXXSourceCompiles)
-    check_cxx_source_compiles("#include <memory>\nint main() { auto u = 
std::make_unique<int>(0); return *u; }\n"
-      CMake_HAVE_CXX_UNIQUE_PTR)
-    if(CMake_HAVE_CXX_UNIQUE_PTR)
+    if(CMake_HAVE_CXX_MAKE_UNIQUE)
       set(CMake_HAVE_SERVER_MODE 1)
     endif()
   endif()
diff --git a/Source/Checks/cm_cxx_features.cmake 
b/Source/Checks/cm_cxx_features.cmake
index 6fde7b6..960c106 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -32,6 +32,7 @@ function(cm_check_cxx_feature name)
 endfunction()
 
 if(CMAKE_CXX_STANDARD)
+  cm_check_cxx_feature(make_unique)
   cm_check_cxx_feature(nullptr)
   cm_check_cxx_feature(override)
   cm_check_cxx_feature(unordered_map)
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;
+}

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

Summary of changes:
 CMakeLists.txt                       |    5 +----
 Source/Checks/cm_cxx_features.cmake  |    1 +
 Source/Checks/cm_cxx_make_unique.cxx |    6 ++++++
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 Source/Checks/cm_cxx_make_unique.cxx


hooks/post-receive
-- 
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Reply via email to