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 5991d310b7b631ab0716bfb9e182260fe836bd60 (commit) via 9eedf92855a1af4a2a797ae2b4c4404f0e2e2b2d (commit) from f5db532193c0e1396286ba4bb796f4be38e3a420 (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=5991d310b7b631ab0716bfb9e182260fe836bd60 commit 5991d310b7b631ab0716bfb9e182260fe836bd60 Merge: f5db532 9eedf92 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Sep 16 13:24:47 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Sep 16 13:24:47 2016 -0400 Merge topic 'cmake-server-basic' into next 9eedf928 Check for availability of unique_ptr and make_unique when building CMake https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9eedf92855a1af4a2a797ae2b4c4404f0e2e2b2d commit 9eedf92855a1af4a2a797ae2b4c4404f0e2e2b2d Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Sep 16 13:21:10 2016 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Sep 16 13:24:32 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 960c106..c6a532f 100644 --- a/Source/Checks/cm_cxx_features.cmake +++ b/Source/Checks/cm_cxx_features.cmake @@ -33,8 +33,12 @@ 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_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: Source/Checks/cm_cxx_features.cmake | 4 ++++ Source/Checks/cm_cxx_unique_ptr.cxx | 6 ++++++ Source/cmConfigure.cmake.h.in | 2 ++ 3 files changed, 12 insertions(+) create mode 100644 Source/Checks/cm_cxx_unique_ptr.cxx hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits