diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-16 17:21:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-09-16 17:22:10 (GMT) |
| commit | aa50cdac439121f9e40ff2638368dc913a0e2361 (patch) | |
| tree | a69eb3c862b978dd6980cb7ffe1443d111ae7ae9 /Source | |
| parent | 00fd64d1263901f96935e15c8d90ee8a338cee1a (diff) | |
| download | CMake-aa50cdac439121f9e40ff2638368dc913a0e2361.zip CMake-aa50cdac439121f9e40ff2638368dc913a0e2361.tar.gz CMake-aa50cdac439121f9e40ff2638368dc913a0e2361.tar.bz2 | |
Check for availability of unique_ptr and make_unique when building CMake
Some code paths may find these useful if available.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Checks/cm_cxx_features.cmake | 5 | ||||
| -rw-r--r-- | Source/Checks/cm_cxx_make_unique.cxx | 6 | ||||
| -rw-r--r-- | Source/Checks/cm_cxx_unique_ptr.cxx | 6 | ||||
| -rw-r--r-- | Source/cmConfigure.cmake.h.in | 2 |
4 files changed, 19 insertions, 0 deletions
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@" |