[Cmake-commits] CMake branch, master, updated. v3.9.3-985-g50e4a45
Kitware Robot
kwrobot at kitware.com
Thu Sep 28 08:15:07 EDT 2017
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, master has been updated
via 50e4a45b9f7028d4476cf370caf5fa73ffedd95b (commit)
via 9e0362caa1f838579b6c863b44e311972c3c95ae (commit)
via 94e67fa11889b634d2343f0623162a994ad1354b (commit)
from a1d59d3e07dbc180abce8aeca4e6bba72985ff23 (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=50e4a45b9f7028d4476cf370caf5fa73ffedd95b
commit 50e4a45b9f7028d4476cf370caf5fa73ffedd95b
Merge: a1d59d3 9e0362c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 28 12:08:21 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Sep 28 08:08:27 2017 -0400
Merge topic 'remove-auto_ptr-checks'
9e0362ca Remove checks for auto_ptr that we no longer need
94e67fa1 cpack: Fix compilation on Cygwin after auto_ptr removal
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1320
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e0362caa1f838579b6c863b44e311972c3c95ae
commit 9e0362caa1f838579b6c863b44e311972c3c95ae
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 27 07:28:24 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 27 09:04:31 2017 -0400
Remove checks for auto_ptr that we no longer need
We no longer use `auto_ptr` at all, so drop the checks for it.
diff --git a/Source/Checks/cm_cxx_auto_ptr.cxx b/Source/Checks/cm_cxx_auto_ptr.cxx
deleted file mode 100644
index d3100fd..0000000
--- a/Source/Checks/cm_cxx_auto_ptr.cxx
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <memory>
-
-std::auto_ptr<int> get_auto_ptr()
-{
- std::auto_ptr<int> ptr;
- ptr = std::auto_ptr<int>(new int(0));
- return ptr;
-}
-
-int use_auto_ptr(std::auto_ptr<int> ptr)
-{
- return *ptr;
-}
-
-int main()
-{
- return use_auto_ptr(get_auto_ptr());
-}
diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake
index 2c39cbe..7755cfe 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -41,7 +41,6 @@ function(cm_check_cxx_feature name)
endif()
endfunction()
-cm_check_cxx_feature(auto_ptr)
cm_check_cxx_feature(eq_delete)
cm_check_cxx_feature(fallthrough)
if(NOT CMake_HAVE_CXX_FALLTHROUGH)
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index 9d11fff..f4e5fb8 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -19,7 +19,6 @@
#cmakedefine HAVE_UNSETENV
#cmakedefine CMAKE_USE_ELF_PARSER
#cmakedefine CMAKE_USE_MACH_PARSER
-#cmakedefine CMake_HAVE_CXX_AUTO_PTR
#cmakedefine CMake_HAVE_CXX_EQ_DELETE
#cmakedefine CMake_HAVE_CXX_FALLTHROUGH
#cmakedefine CMake_HAVE_CXX_GNU_FALLTHROUGH
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94e67fa11889b634d2343f0623162a994ad1354b
commit 94e67fa11889b634d2343f0623162a994ad1354b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 27 09:01:55 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 27 09:04:28 2017 -0400
cpack: Fix compilation on Cygwin after auto_ptr removal
Fix a compilation error on Cygwin introduced by commit f0489856e3
(Retire std::auto_ptr and its macro CM_AUTO_PTR, 2017-09-21).
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index f2c54fc..addb54e 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -194,7 +194,7 @@ int main(int argc, char const* const* argv)
cmGlobalGenerator cmgg(&cminst);
cmMakefile globalMF(&cmgg, cminst.GetCurrentSnapshot());
#if defined(__CYGWIN__)
- globalMF->AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0");
+ globalMF.AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0");
#endif
bool cpackConfigFileSpecified = true;
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cpack.cxx | 2 +-
Source/Checks/cm_cxx_auto_ptr.cxx | 18 ------------------
Source/Checks/cm_cxx_features.cmake | 1 -
Source/cmConfigure.cmake.h.in | 1 -
4 files changed, 1 insertion(+), 21 deletions(-)
delete mode 100644 Source/Checks/cm_cxx_auto_ptr.cxx
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list