[Cmake-commits] CMake branch, next, updated. v3.6.2-2121-ga6b0458

[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  a6b04580f92ba926fac8b8feb401413824ee82d2 (commit)
       via  7b30345dee7903d3793a79f9dc5db620ef95de87 (commit)
      from  90c30da30240895a3cf717c7248b84f485771194 (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=a6b04580f92ba926fac8b8feb401413824ee82d2
commit a6b04580f92ba926fac8b8feb401413824ee82d2
Merge: 90c30da 7b30345
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 16 11:57:18 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 16 11:57:18 2016 -0400

    Merge topic 'cmake-server-basic' into next
    
    7b30345d fixup! cmake-server: Bare-bones server implementation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b30345dee7903d3793a79f9dc5db620ef95de87
commit 7b30345dee7903d3793a79f9dc5db620ef95de87
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 16 11:55:50 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 16 11:56:59 2016 -0400

    fixup! cmake-server: Bare-bones server implementation

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04ce209..ce76316 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -703,12 +703,18 @@ endif()
 CMAKE_SETUP_TESTING()
 
 # Check whether to build server mode or not:
-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(NOT CMake_TEST_EXTERNAL_CMAKE AND NOT CMAKE_BOOTSTRAP AND CMake_HAVE_CXX_AUTO_TYPE AND CMake_HAVE_CXX_RANGE_FOR AND CMAKE_USE_LIBUV)
-  set(CMake_HAVE_SERVER_MODE 1)
-else()
-  set(CMake_HAVE_SERVER_MODE 0)
+set(CMake_HAVE_SERVER_MODE 0)
+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)
+      set(CMake_HAVE_SERVER_MODE 1)
+    endif()
+  endif()
 endif()
 
 if(NOT CMake_TEST_EXTERNAL_CMAKE)

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

Summary of changes:
 CMakeLists.txt |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake