[Cmake-commits] CMake branch, master, updated. v3.6.0-rc4-275-g2c75997
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 2c759971e4b2a51a140e00c995bd9f062dd8df59 (commit) from 108c665877b68d02d96491436d179a33fd7116fa (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=2c759971e4b2a51a140e00c995bd9f062dd8df59 commit 2c759971e4b2a51a140e00c995bd9f062dd8df59 Author: Kitware Robot AuthorDate: Thu Jun 30 00:01:07 2016 -0400 Commit: Kitware Robot CommitDate: Thu Jun 30 00:01:07 2016 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9d2e2d4..94f6daf 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 6) -set(CMake_VERSION_PATCH 20160629) +set(CMake_VERSION_PATCH 20160630) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake annotated tag, v3.6.0-rc4, created. v3.6.0-rc4
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 annotated tag, v3.6.0-rc4 has been created at c5888b14ff23f075f73d3bf0933c5029459236f0 (tag) tagging dd71ec2c93fdf34f8bbcaafbc05f000ef6ed6cab (commit) replaces v3.6.0-rc3 tagged by Brad King on Wed Jun 29 13:26:01 2016 -0400 - Log - CMake 3.6.0-rc4 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJXdASqAAoJEC0s7xA0khaEdGgP/0FGgZlJBOJQN6NykMgAIFtb jd4R7xaR2970m0FsDuH+v1a75w0I2CE3SU1W/RFPJK0NBqGipUjBErF7aZDGaqpi EkXPFaSOGHDegP/eKhvWVuvP01+ush2pA18P9I7VjhllBarU+3vnHCd8Ko5y8g/U 8pzIcNTonnv3pXEUTGA0wuaKSvoZL/OmYVGlRpOMz0AJkbbMYz27tQ0bV7ojDxqx pGB9VDkvqv9B2BMUlpBBN0BHfr5d6KV7oHJO3YxKPSUH13QgoPHAn0YZ2NlEELoD Zg25dd5IlSZWHqrLzen/zN6rdj1Z+YSkG0QbwwuPw5WW6dvQpOvOVAndOaU00sG2 MgX+SoaWjbGKI38pJx+qyje+cIQmk2jNPqyz/q/pkgFP6jDIG1mF/GbvybsEF7aH +tRaNvPGynTH3l1dC356zsC/CR8OGZtcwgRgnmVMRj5HqCehSzbBTdJlArXZTNNA Vq4XKSqFwgs0lCq/No1aUwGCIda7vs6ibccMAVgm0dCbBcxnUrrQhTLHHzmtmIsj AXPg8Zk87+K86F4prCCL+yNrLgb7Bk5EErRjRmUegqMQDhUdl2wVvR5pBxudz5wU zyFkpICzRuMMlb1Rd8GVaHo9BRny8+nqI+8Q9n1xSsf6kvBPjJWoYouKaycjguAA Ztz/Trq0RU4dkuI5QJ0z =f9OZ -END PGP SIGNATURE- Bartosz Kosiorek (1): Help: Describe VERSION and SOVERSION meanings for Mach-O binaries Ben Boeckel (1): ninja, rc: ignore CMAKE_NINJA_FORCE_RESPONSE_FILE for RC files Brad King (8): Merge branch 'backport-GetPrerequisites-typo' into release Merge branch 'doc-osx-versions' into release Merge branch 'FindHDF5-handle-unsuffixed' into release Merge branch 'ninja-no-rsp-for-rc' into release Merge branch 'doc-cross-reference-lang-standard-and-extensions' into release Revert "try_compile: Honor CMAKE__FLAGS_ changes" Merge branch 'revert-try_compile-config-flags' into release CMake 3.6.0-rc4 Gregor Jasny (1): Help: Cross reference CXX_STANDARD and CXX_EXTENSIONS (#16162) Robert Maynard (5): FindHDF5: correctly add lang to each component target name. FindHDF5: Handle HDF5 builds with non-suffixed components FindHDF5: When component targets not found fallback to compiler wrappers FindHDF5: cache the correct path to the high level libraries FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmake Rolf Eike Beer (1): GetPrerequisites: fix typo in comment --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-644-g7eff8e7
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 7eff8e758d971032110a02cd1c550ff4bf0b4671 (commit) via 108c665877b68d02d96491436d179a33fd7116fa (commit) from 4c202912b77571d5a1e1e6b78b345ee0901fc475 (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=7eff8e758d971032110a02cd1c550ff4bf0b4671 commit 7eff8e758d971032110a02cd1c550ff4bf0b4671 Merge: 4c20291 108c665 Author: Brad King AuthorDate: Wed Jun 29 13:25:27 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 13:25:27 2016 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.6.0-rc3-17-gdd71ec2
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, release has been updated via dd71ec2c93fdf34f8bbcaafbc05f000ef6ed6cab (commit) from e34c5543faf33284ff9615d53fcfa5a163adf6c3 (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 - --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc3-291-g108c665
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 108c665877b68d02d96491436d179a33fd7116fa (commit) via dd71ec2c93fdf34f8bbcaafbc05f000ef6ed6cab (commit) from 7808ba0852708963a6c37c8027b3382c2157422e (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 - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-642-g4c20291
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 4c202912b77571d5a1e1e6b78b345ee0901fc475 (commit) via 78f240b14508f0410dc81fcea285a88adffec8fc (commit) via 08fba24802e8db6b1769ce43c85d481571902239 (commit) via 4572d36b1eb9527a7a23e7d777b1b7a5227bc960 (commit) via f4613f70efb1762d6ce69ba3066186a1cd3e53a3 (commit) via 2aa8e005a3f6e2fa357f5d11549a609213f738e5 (commit) via ee6edc8a23c67c90844ab00ae4f49cf6764c8fd7 (commit) via 7e95a34b611d999af534ffcc40f08f675bba5a1c (commit) via 2110a7afb53b91c35bec0007fb7973bf204436d9 (commit) via b809547abb3d4afdce3a5e64021f4bc81d6aef37 (commit) via 5836fda70dc97328a920ff32c0676a2e8da767e7 (commit) via 6af458cedec9585ce13d3afc3ff78f1683343e38 (commit) from 4e7bb44e4d6ba33cd5495913f73985f5b6d80825 (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=4c202912b77571d5a1e1e6b78b345ee0901fc475 commit 4c202912b77571d5a1e1e6b78b345ee0901fc475 Merge: 4e7bb44 78f240b Author: Brad King AuthorDate: Wed Jun 29 11:04:09 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 11:04:09 2016 -0400 Merge topic 'reorganize-cmCTest' into next 78f240b1 Help: Fix documentation of ctest --build-and-test 08fba248 Help: Consistently use quotes and fix punctuation in ctest(1) manual 4572d36b doxygen: Introduce \cm_manual alias to reference manual from within doxygen f4613f70 doxygen: Teach doc_makeall.sh how to skip cleaning of intermediate files 2aa8e005 cmCTest: Improve doxygen for Part and Model enums ee6edc8a cmCTest: Update doxygen to be consistent 7e95a34b cmCTest: Rename "ProcessTests()" to "ProcessSteps()" and improve doxygen 2110a7af cmCTest: Facilitate code reading adding consistent comments in Run() b809547a cmCTest: Improve readability adding "HandleTest(Action|Model)Argument()" 5836fda7 cmCTest: Improve readability adding "RunCMakeAndTest()" and "ExecuteTests()" 6af458ce cmCTest: Fix typo https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78f240b14508f0410dc81fcea285a88adffec8fc commit 78f240b14508f0410dc81fcea285a88adffec8fc Author: Jean-Christophe Fillion-Robin AuthorDate: Thu May 5 10:21:52 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 11:01:10 2016 -0400 Help: Fix documentation of ctest --build-and-test Since commit v3.0.0-rc1~260^2~14 (ctest: Make the --build-makeprogram optional for --build-and-test, 2013-11-14), binary dictionary is also required to run CTest given the option `--build-nocmake`. diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 04b1d01..ce81578 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -233,14 +233,13 @@ Options label associated with the tests run. If there are no labels on the tests, nothing extra is printed. -``--build-and-test`` +``--build-and-test `` Configure, build and run a test. This option tells ctest to configure (i.e. run cmake on), build, and or execute a test. The configure and test steps are optional. The arguments to this command line are the source and binary - directories. By default this will run CMake on the Source/Bin - directories specified unless ``--build-nocmake`` is specified. + directories. The ``--build-generator`` option *must* be provided to use ``--build-and-test``. If ``--test-command`` is specified then that will be run after the build is complete. Other options that affect this https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08fba24802e8db6b1769ce43c85d481571902239 commit 08fba24802e8db6b1769ce43c85d481571902239 Author: Jean-Christophe Fillion-Robin AuthorDate: Wed May 4 22:32:45 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 11:01:10 2016 -0400 Help: Consistently use quotes and fix punctuation in ctest(1) manual diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index e797333..04b1d01 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -56,7 +56,7 @@ Options Enable failover. This option allows ctest to resume a test set execution that was - previously interrupted. If no interruption occurred, the -F option + previously interrupted. If no interruption occurred, the ``-F`` option will have no effect. ``-j , --parallel `` @@ -77,12 +77,12 @@ Options Make ctest quiet. This option will suppress all the output. The output log file will - still be generated if the --output-log is specified. Options such - as --verbose, --extra-verbose, and --debug are ignored if --quiet is - specified.
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-630-g4e7bb44
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 4e7bb44e4d6ba33cd5495913f73985f5b6d80825 (commit) via 60212979ea6cf92be7557358ef89484317ae0340 (commit) via e4d3914639d1e7b41337c9626b91458c4fe6ae95 (commit) via d4f524040e8b9573bd568e4bb6b6ddb70d6ab366 (commit) via bf969198067649a55752db21d03ae8a0fb443c6e (commit) via ca4276e435e251e1b2011a7a523aecdbf85c18ec (commit) via d38a37ea1539eafec6cec6ef59cc9419531cad91 (commit) via ec8f744a11dfcab9560387168cab76260aa0b777 (commit) from f723860ff359eedfff8a0371eba7691027676e29 (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=4e7bb44e4d6ba33cd5495913f73985f5b6d80825 commit 4e7bb44e4d6ba33cd5495913f73985f5b6d80825 Merge: f723860 6021297 Author: Brad King AuthorDate: Wed Jun 29 10:15:32 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 10:15:32 2016 -0400 Merge topic 'update-liblzma' into next 60212979 Merge branch 'upstream-liblzma' into update-liblzma e4d39146 liblzma 2014-12-21 (265e5ffb) d4f52404 liblzma: Revise update script to get version 5.0.8 bf969198 Merge branch 'upstream-liblzma' into update-liblzma ca4276e4 liblzma: Remove CMake-specific README d38a37ea liblzma 2013-06-30 (b69900ed) ec8f744a Add script to update liblzma from upstream https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60212979ea6cf92be7557358ef89484317ae0340 commit 60212979ea6cf92be7557358ef89484317ae0340 Merge: d4f5240 e4d3914 Author: Brad King AuthorDate: Wed Jun 29 10:14:03 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 10:14:03 2016 -0400 Merge branch 'upstream-liblzma' into update-liblzma * upstream-liblzma: liblzma 2014-12-21 (265e5ffb) diff --cc Utilities/cmliblzma/liblzma/check/crc32_fast.c index 13f65b4,000..c2c3cb7 mode 100644,00..100644 --- a/Utilities/cmliblzma/liblzma/check/crc32_fast.c +++ b/Utilities/cmliblzma/liblzma/check/crc32_fast.c @@@ -1,86 -1,0 +1,86 @@@ +/// +// +/// \file crc32.c +/// \brief CRC32 calculation +/// +/// Calculate the CRC32 using the slice-by-eight algorithm. +/// It is explained in this document: +/// http://www.intel.com/technology/comms/perfnet/download/CRC_generators.pdf +/// The code in this file is not the same as in Intel's paper, but +/// the basic principle is identical. +// +// Author: Lasse Collin +// +// This file has been put into the public domain. +// You can do whatever you want with this file. +// +/// + +#include "check.h" +#include "crc_macros.h" + + - // If you make any changes, do some bench marking! Seemingly unrelated ++// If you make any changes, do some benchmarking! Seemingly unrelated +// changes can very easily ruin the performance (and very probably is +// very compiler dependent). +extern LZMA_API(uint32_t) +lzma_crc32(const uint8_t *buf, size_t size, uint32_t crc) +{ + crc = ~crc; + +#ifdef WORDS_BIGENDIAN + crc = bswap32(crc); +#endif + + if (size > 8) { + const uint8_t * limit; + + // Fix the alignment, if needed. The if statement above + // ensures that this won't read past the end of buf[]. + while ((uintptr_t)(buf) & 7) { + crc = lzma_crc32_table[0][*buf++ ^ A(crc)] ^ S8(crc); + --size; + } + + // Calculate the position where to stop. + limit = buf + (size & ~(size_t)(7)); + + // Calculate how many bytes must be calculated separately + // before returning the result. + size &= (size_t)(7); + + // Calculate the CRC32 using the slice-by-eight algorithm. + while (buf < limit) { + uint32_t tmp; + + crc ^= *(const uint32_t *)(buf); + buf += 4; + + crc = lzma_crc32_table[7][A(crc)] + ^ lzma_crc32_table[6][B(crc)] + ^ lzma_crc32_table[5][C(crc)] + ^ lzma_crc32_table[4][D(crc)]; + + tmp = *(const uint32_t *)(buf); + buf += 4; + + // At least with some compilers, it is critical for + // performance, that the crc variable is XORed + // between the two table-looku
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc3-289-g7808ba0
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 7808ba0852708963a6c37c8027b3382c2157422e (commit) via e34c5543faf33284ff9615d53fcfa5a163adf6c3 (commit) via eb6f81705a8bfd89cf0afeb4c26d3e2944e3ecd3 (commit) via 76c66bf575a6c595b02bf241d03b74374857436a (commit) via cd293886159e6130fb55cdbc3ef291ddb83883de (commit) from 8d79375818efbaa06858a8e2d176ab8a251bef63 (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 - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-622-gf723860
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 f723860ff359eedfff8a0371eba7691027676e29 (commit) via b0a9768ab3486798b0713a40bfa145462b824566 (commit) via dd71ec2c93fdf34f8bbcaafbc05f000ef6ed6cab (commit) from 4edd80fc87dada543e506c748391dc0b7c8a563a (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=f723860ff359eedfff8a0371eba7691027676e29 commit f723860ff359eedfff8a0371eba7691027676e29 Merge: 4edd80f b0a9768 Author: Brad King AuthorDate: Wed Jun 29 09:52:15 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 09:52:15 2016 -0400 Merge topic 'test-release' into next b0a9768a Merge branch 'release' into test-release dd71ec2c CMake 3.6.0-rc4 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0a9768ab3486798b0713a40bfa145462b824566 commit b0a9768ab3486798b0713a40bfa145462b824566 Merge: 7808ba0 dd71ec2 Author: Brad King AuthorDate: Wed Jun 29 09:51:55 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 09:51:55 2016 -0400 Merge branch 'release' into test-release https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd71ec2c93fdf34f8bbcaafbc05f000ef6ed6cab commit dd71ec2c93fdf34f8bbcaafbc05f000ef6ed6cab Author: Brad King AuthorDate: Wed Jun 29 09:51:33 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 09:51:33 2016 -0400 CMake 3.6.0-rc4 diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 6038ef6..c782c5d 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,4 +2,4 @@ set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 6) set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 3) +set(CMake_VERSION_RC 4) --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-609-g567fdf0
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 567fdf09bb8b533f930e0fe8099159ac7bbd9886 (commit) via e2d8a27ef2bec64118c541622cf6d353f788db96 (commit) from d4342c4143c6f58019f5900f897336fadaaa013a (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=567fdf09bb8b533f930e0fe8099159ac7bbd9886 commit 567fdf09bb8b533f930e0fe8099159ac7bbd9886 Merge: d4342c4 e2d8a27 Author: Brad King AuthorDate: Wed Jun 29 09:45:56 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 09:45:56 2016 -0400 Merge topic 'refactor-auto_ptr' into next e2d8a27e Avoid using KWSys auto_ptr by adopting it ourselves https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2d8a27ef2bec64118c541622cf6d353f788db96 commit e2d8a27ef2bec64118c541622cf6d353f788db96 Author: Brad King AuthorDate: Tue Jun 28 10:17:52 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 09:41:34 2016 -0400 Avoid using KWSys auto_ptr by adopting it ourselves Replace use of cmsys::auto_ptr with a CM_AUTO_PTR macro that maps to our own implementation adopted from the KWSys auto_ptr implementation. Later we may be able to map CM_AUTO_PTR to std::auto_ptr on compilers that do not warn about it. Automate the client site conversions: git grep -l auto_ptr -- Source/ | grep -v Source/kwsys/ | xargs sed -i \ 's|cmsys::auto_ptr|CM_AUTO_PTR|;s|cmsys/auto_ptr.hxx|cm_auto_ptr.hxx|' diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst index 7bfdcad..afaccc6 100644 --- a/Help/manual/cmake-developer.7.rst +++ b/Help/manual/cmake-developer.7.rst @@ -24,9 +24,10 @@ to build with such toolchains. std::auto_ptr - -Some implementations have a ``std::auto_ptr`` which can not be used as a -return value from a function. ``std::auto_ptr`` may not be used. Use -``cmsys::auto_ptr`` instead. +The ``std::auto_ptr`` template is deprecated in C++11. We want to use it +so we can build on C++98 compilers but we do not want to turn off compiler +warnings about deprecated interfaces in general. Use the ``CM_AUTO_PTR`` +macro instead. size_t -- diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index fd73984..d49ebbb 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -364,6 +364,7 @@ set(SRCS cmake.cxx cmake.h + cm_auto_ptr.hxx cm_get_date.h cm_get_date.c cm_sha2.h diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index b5b364d..97216c3 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -1044,7 +1044,7 @@ std::string cmCPackWIXGenerator::CreateNewIdForPath(std::string const& path) std::string cmCPackWIXGenerator::CreateHashedId( std::string const& path, std::string const& normalizedFilename) { - cmsys::auto_ptr sha1 = cmCryptoHash::New("SHA1"); + CM_AUTO_PTR sha1 = cmCryptoHash::New("SHA1"); std::string hash = sha1->HashString(path.c_str()); std::string identifier; diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 914d0dc..df8bb0f 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -624,7 +624,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cm.AddCMakePaths(); cm.SetProgressCallback(cmCPackGeneratorProgress, this); cmGlobalGenerator gg(&cm); -cmsys::auto_ptr mf( +CM_AUTO_PTR mf( new cmMakefile(&gg, cm.GetCurrentSnapshot())); if (!installSubDirectory.empty() && installSubDirectory != "/") { tempInstallDirectory += installSubDirectory; diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index b4a2c6f..771519c 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -185,7 +185,7 @@ int main(int argc, char const* const* argv) cminst.GetCurrentSnapshot().SetDefaultDefinitions(); cminst.GetState()->RemoveUnscriptableCommands(); cmGlobalGenerator cmgg(&cminst); - cmsys::auto_ptr globalMF( + CM_AUTO_PTR globalMF( new cmMakefile(&cmgg, cminst.GetCurrentSnapshot())); #if defined(__CYGWIN__) globalMF->AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0"); diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index 477f16e..3eed79e 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -612,7 +612,7 @@ int cmCTestLaunch::Main(int argc, const char* const argv[]) #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmake.h" -#include +
[Cmake-commits] CMake branch, release, updated. v3.6.0-rc3-16-ge34c554
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, release has been updated via e34c5543faf33284ff9615d53fcfa5a163adf6c3 (commit) via 943fe6e3b40cde7eb927bb2e2acf049fe580c188 (commit) via eb6f81705a8bfd89cf0afeb4c26d3e2944e3ecd3 (commit) via c6a077d6980ea164578b7544c852ddf1e8a8a35b (commit) via 76c66bf575a6c595b02bf241d03b74374857436a (commit) via 15b3f6f0f187ab12c29e437f737356bed13d977b (commit) via cd293886159e6130fb55cdbc3ef291ddb83883de (commit) via 234deec2ea265f130a220547bcbc697bacbb25c6 (commit) via 963b576fd2605f25ced8790fc17f5baa6ecee761 (commit) via 9f2728cef3763dff93a43b933a10f32eb73f7c6b (commit) via 149539d9c2d90da76facbd70c969b82af8e2448a (commit) via f30b0fec749710e7eec68ddd148215609a5c01f9 (commit) from 24bad96ec0aff57e52893a3517052e0c5a45f683 (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 - --- Summary of changes: Help/prop_tgt/CXX_EXTENSIONS.rst |3 ++- Help/prop_tgt/CXX_STANDARD.rst |2 ++ Help/prop_tgt/C_EXTENSIONS.rst |3 ++- Help/prop_tgt/C_STANDARD.rst |2 ++ Help/release/3.6.rst |5 Modules/FindHDF5.cmake | 25 Source/cmCoreTryCompile.cxx|8 --- Source/cmNinjaTargetGenerator.cxx |6 +++-- Tests/CMakeLists.txt |3 +++ Tests/RunCMake/try_compile/CompileFlags.cmake | 17 - Tests/RunCMake/try_compile/RunCMakeTest.cmake |1 - Tests/RunCMake/try_compile/src.c |3 --- Tests/VSResourceNinjaForceRSP/CMakeLists.txt |7 ++ .../lib.cpp|0 .../main.cpp |3 ++- .../lib.rc => VSResourceNinjaForceRSP/test.rc} |0 16 files changed, 45 insertions(+), 43 deletions(-) delete mode 100644 Tests/RunCMake/try_compile/CompileFlags.cmake create mode 100644 Tests/VSResourceNinjaForceRSP/CMakeLists.txt copy Tests/{VSResource => VSResourceNinjaForceRSP}/lib.cpp (100%) copy Tests/{RunCMake/CompatibleInterface => VSResourceNinjaForceRSP}/main.cpp (63%) copy Tests/{VSResource/lib.rc => VSResourceNinjaForceRSP/test.rc} (100%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-619-g4edd80f
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 4edd80fc87dada543e506c748391dc0b7c8a563a (commit) via 7808ba0852708963a6c37c8027b3382c2157422e (commit) via e34c5543faf33284ff9615d53fcfa5a163adf6c3 (commit) via eb6f81705a8bfd89cf0afeb4c26d3e2944e3ecd3 (commit) via 76c66bf575a6c595b02bf241d03b74374857436a (commit) via cd293886159e6130fb55cdbc3ef291ddb83883de (commit) from 3dfef7bab08f978ef0d81b18fe39633666c0fd83 (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=4edd80fc87dada543e506c748391dc0b7c8a563a commit 4edd80fc87dada543e506c748391dc0b7c8a563a Merge: 3dfef7b 7808ba0 Author: Brad King AuthorDate: Wed Jun 29 09:50:36 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 09:50:36 2016 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-613-g3dfef7b
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 3dfef7bab08f978ef0d81b18fe39633666c0fd83 (commit) via b5ec5b0901177ebcd116d6ddd66ed114549014ec (commit) from b89f500cc4832b304b4cf604e4955fdaf63a1b13 (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=3dfef7bab08f978ef0d81b18fe39633666c0fd83 commit 3dfef7bab08f978ef0d81b18fe39633666c0fd83 Merge: b89f500 b5ec5b0 Author: Brad King AuthorDate: Wed Jun 29 09:48:26 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 09:48:26 2016 -0400 Merge topic 'refactor-auto_ptr' into next b5ec5b09 Avoid using KWSys auto_ptr by adopting it ourselves https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5ec5b0901177ebcd116d6ddd66ed114549014ec commit b5ec5b0901177ebcd116d6ddd66ed114549014ec Author: Brad King AuthorDate: Tue Jun 28 10:17:52 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 09:47:58 2016 -0400 Avoid using KWSys auto_ptr by adopting it ourselves Replace use of cmsys::auto_ptr with a CM_AUTO_PTR macro that maps to our own implementation adopted from the KWSys auto_ptr implementation. Later we may be able to map CM_AUTO_PTR to std::auto_ptr on compilers that do not warn about it. Automate the client site conversions: git grep -l auto_ptr -- Source/ | grep -v Source/kwsys/ | xargs sed -i \ 's|cmsys::auto_ptr|CM_AUTO_PTR|;s|cmsys/auto_ptr.hxx|cm_auto_ptr.hxx|' diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst index 7bfdcad..afaccc6 100644 --- a/Help/manual/cmake-developer.7.rst +++ b/Help/manual/cmake-developer.7.rst @@ -24,9 +24,10 @@ to build with such toolchains. std::auto_ptr - -Some implementations have a ``std::auto_ptr`` which can not be used as a -return value from a function. ``std::auto_ptr`` may not be used. Use -``cmsys::auto_ptr`` instead. +The ``std::auto_ptr`` template is deprecated in C++11. We want to use it +so we can build on C++98 compilers but we do not want to turn off compiler +warnings about deprecated interfaces in general. Use the ``CM_AUTO_PTR`` +macro instead. size_t -- diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index fd73984..d49ebbb 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -364,6 +364,7 @@ set(SRCS cmake.cxx cmake.h + cm_auto_ptr.hxx cm_get_date.h cm_get_date.c cm_sha2.h diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index b5b364d..97216c3 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -1044,7 +1044,7 @@ std::string cmCPackWIXGenerator::CreateNewIdForPath(std::string const& path) std::string cmCPackWIXGenerator::CreateHashedId( std::string const& path, std::string const& normalizedFilename) { - cmsys::auto_ptr sha1 = cmCryptoHash::New("SHA1"); + CM_AUTO_PTR sha1 = cmCryptoHash::New("SHA1"); std::string hash = sha1->HashString(path.c_str()); std::string identifier; diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 914d0dc..df8bb0f 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -624,7 +624,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cm.AddCMakePaths(); cm.SetProgressCallback(cmCPackGeneratorProgress, this); cmGlobalGenerator gg(&cm); -cmsys::auto_ptr mf( +CM_AUTO_PTR mf( new cmMakefile(&gg, cm.GetCurrentSnapshot())); if (!installSubDirectory.empty() && installSubDirectory != "/") { tempInstallDirectory += installSubDirectory; diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index b4a2c6f..771519c 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -185,7 +185,7 @@ int main(int argc, char const* const* argv) cminst.GetCurrentSnapshot().SetDefaultDefinitions(); cminst.GetState()->RemoveUnscriptableCommands(); cmGlobalGenerator cmgg(&cminst); - cmsys::auto_ptr globalMF( + CM_AUTO_PTR globalMF( new cmMakefile(&cmgg, cminst.GetCurrentSnapshot())); #if defined(__CYGWIN__) globalMF->AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0"); diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index 477f16e..3eed79e 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -612,7 +612,7 @@ int cmCTestLaunch::Main(int argc, const char* const argv[]) #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmake.h" -#include +
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-611-gb89f500
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 b89f500cc4832b304b4cf604e4955fdaf63a1b13 (commit) via 586ec3aaf0ed4c357e06d9baa99d553fa4ad6934 (commit) from 567fdf09bb8b533f930e0fe8099159ac7bbd9886 (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=b89f500cc4832b304b4cf604e4955fdaf63a1b13 commit b89f500cc4832b304b4cf604e4955fdaf63a1b13 Merge: 567fdf0 586ec3a Author: Brad King AuthorDate: Wed Jun 29 09:47:51 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 09:47:51 2016 -0400 Merge topic 'refactor-auto_ptr' into next 586ec3aa fixup! Avoid using KWSys auto_ptr by adopting it ourselves https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=586ec3aaf0ed4c357e06d9baa99d553fa4ad6934 commit 586ec3aaf0ed4c357e06d9baa99d553fa4ad6934 Author: Brad King AuthorDate: Wed Jun 29 09:47:28 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 09:47:28 2016 -0400 fixup! Avoid using KWSys auto_ptr by adopting it ourselves diff --git a/Source/cm_auto_ptr.hxx b/Source/cm_auto_ptr.hxx index f450228..2cd35c3 100644 --- a/Source/cm_auto_ptr.hxx +++ b/Source/cm_auto_ptr.hxx @@ -17,14 +17,14 @@ // FIXME: Use std::auto_ptr on compilers that do not warn about it. #define CM_AUTO_PTR cm::auto_ptr -// The HP compiler and VS6 cannot handle the conversions necessary to use +// The HP compiler cannot handle the conversions necessary to use // auto_ptr_ref to pass an auto_ptr returned from one function // directly to another function as in use_auto_ptr(get_auto_ptr()). // We instead use const_cast to achieve the syntax on those platforms. // We do not use const_cast on other platforms to maintain the C++ // standard design and guarantee that if an auto_ptr is bound // to a reference-to-const then ownership will be maintained. -#if defined(__HP_aCC) || (defined(_MSC_VER) && _MSC_VER <= 1200) +#if defined(__HP_aCC) #define cm_AUTO_PTR_REF 0 #define cm_AUTO_PTR_CONST const #define cm_AUTO_PTR_CAST(a) cast(a) --- Summary of changes: Source/cm_auto_ptr.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-607-gd4342c4
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 d4342c4143c6f58019f5900f897336fadaaa013a (commit) via b33f276ed81bdbcf25ee6c5e3a7f051c5c2773ee (commit) from a10cf4ec311bbb17f20d334ed5d7530cf3fe247f (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=d4342c4143c6f58019f5900f897336fadaaa013a commit d4342c4143c6f58019f5900f897336fadaaa013a Merge: a10cf4e b33f276 Author: Brad King AuthorDate: Wed Jun 29 09:26:45 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 09:26:45 2016 -0400 Merge topic 'refactor-auto_ptr' into next b33f276e Revert "Avoid using KWSys auto_ptr and use std::auto_ptr when possible" https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b33f276ed81bdbcf25ee6c5e3a7f051c5c2773ee commit b33f276ed81bdbcf25ee6c5e3a7f051c5c2773ee Author: Brad King AuthorDate: Wed Jun 29 09:26:18 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 09:26:18 2016 -0400 Revert "Avoid using KWSys auto_ptr and use std::auto_ptr when possible" This reverts commit d6409f1f4ed7a4aab1ba7f48c9e2c3aabfffc342. diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst index afaccc6..7bfdcad 100644 --- a/Help/manual/cmake-developer.7.rst +++ b/Help/manual/cmake-developer.7.rst @@ -24,10 +24,9 @@ to build with such toolchains. std::auto_ptr - -The ``std::auto_ptr`` template is deprecated in C++11. We want to use it -so we can build on C++98 compilers but we do not want to turn off compiler -warnings about deprecated interfaces in general. Use the ``CM_AUTO_PTR`` -macro instead. +Some implementations have a ``std::auto_ptr`` which can not be used as a +return value from a function. ``std::auto_ptr`` may not be used. Use +``cmsys::auto_ptr`` instead. size_t -- diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index d49ebbb..fd73984 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -364,7 +364,6 @@ set(SRCS cmake.cxx cmake.h - cm_auto_ptr.hxx cm_get_date.h cm_get_date.c cm_sha2.h diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 97216c3..b5b364d 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -1044,7 +1044,7 @@ std::string cmCPackWIXGenerator::CreateNewIdForPath(std::string const& path) std::string cmCPackWIXGenerator::CreateHashedId( std::string const& path, std::string const& normalizedFilename) { - CM_AUTO_PTR sha1 = cmCryptoHash::New("SHA1"); + cmsys::auto_ptr sha1 = cmCryptoHash::New("SHA1"); std::string hash = sha1->HashString(path.c_str()); std::string identifier; diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index df8bb0f..914d0dc 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -624,7 +624,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cm.AddCMakePaths(); cm.SetProgressCallback(cmCPackGeneratorProgress, this); cmGlobalGenerator gg(&cm); -CM_AUTO_PTR mf( +cmsys::auto_ptr mf( new cmMakefile(&gg, cm.GetCurrentSnapshot())); if (!installSubDirectory.empty() && installSubDirectory != "/") { tempInstallDirectory += installSubDirectory; diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 771519c..b4a2c6f 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -185,7 +185,7 @@ int main(int argc, char const* const* argv) cminst.GetCurrentSnapshot().SetDefaultDefinitions(); cminst.GetState()->RemoveUnscriptableCommands(); cmGlobalGenerator cmgg(&cminst); - CM_AUTO_PTR globalMF( + cmsys::auto_ptr globalMF( new cmMakefile(&cmgg, cminst.GetCurrentSnapshot())); #if defined(__CYGWIN__) globalMF->AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0"); diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index 3eed79e..477f16e 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -612,7 +612,7 @@ int cmCTestLaunch::Main(int argc, const char* const argv[]) #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmake.h" -#include +#include void cmCTestLaunch::LoadConfig() { cmake cm; @@ -620,7 +620,7 @@ void cmCTestLaunch::LoadConfig() cm.SetHomeOutputDirectory(""); cm.GetCurrentSnapshot().SetDefaultDefinitions(); cmGlobalGenerator gg(&cm); - CM_AUTO_PTR mf(new cmMakefile(&gg, cm.GetCurrentSnapshot())); + cmsys::auto_ptr mf(new cmMakefile(&gg, cm.GetCurrentSnapshot())
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-605-ga10cf4e
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 a10cf4ec311bbb17f20d334ed5d7530cf3fe247f (commit) via d582c23a47ceef09e80435d6b986e3938f7f1521 (commit) from 3caf8ce1fea07b10b0d9ee40d3d1366ac3a59aaa (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=a10cf4ec311bbb17f20d334ed5d7530cf3fe247f commit a10cf4ec311bbb17f20d334ed5d7530cf3fe247f Merge: 3caf8ce d582c23 Author: Brad King AuthorDate: Wed Jun 29 09:17:03 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 09:17:03 2016 -0400 Merge topic 'try_compile-config-flags' into next d582c23a try_compile: Add policy CMP0066 to honor CMAKE__FLAGS_ https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d582c23a47ceef09e80435d6b986e3938f7f1521 commit d582c23a47ceef09e80435d6b986e3938f7f1521 Author: Brad King AuthorDate: Tue Jun 28 15:10:18 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 09:11:02 2016 -0400 try_compile: Add policy CMP0066 to honor CMAKE__FLAGS_ In the `try_compile` source file signature we propagate the caller's value of `CMAKE__FLAGS` into the test project. Extend this to propagate `CMAKE__FLAGS_` too instead of always using the default value in the test project. This will be useful, for example, to allow the MSVC runtime library to be changed (e.g. `-MDd` => `-MTd`). However, some projects may currently depend on this not being done, so we need to activate the behavior using a policy. This change was originally made by commit v3.6.0-rc1~160^2 (try_compile: Honor CMAKE__FLAGS_ changes, 2016-04-11) but without the policy and so had to be reverted during the 3.6 release candidate cycle. Fixes #16174. diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst index 43f4637..0cfe983 100644 --- a/Help/manual/cmake-policies.7.rst +++ b/Help/manual/cmake-policies.7.rst @@ -51,6 +51,14 @@ The :variable:`CMAKE_MINIMUM_REQUIRED_VERSION` variable may also be used to determine whether to report an error on use of deprecated macros or functions. +Policies Introduced by CMake 3.7 + + +.. toctree:: + :maxdepth: 1 + + CMP0066: Honor per-config flags in try_compile() source-file signature. + Policies Introduced by CMake 3.4 diff --git a/Help/policy/CMP0066.rst b/Help/policy/CMP0066.rst new file mode 100644 index 000..d1dcb0e --- /dev/null +++ b/Help/policy/CMP0066.rst @@ -0,0 +1,27 @@ +CMP0066 +--- + +Honor per-config flags in :command:`try_compile` source-file signature. + +The source file signature of the :command:`try_compile` command uses the value +of the :variable:`CMAKE__FLAGS` variable in the test project so that the +test compilation works as it would in the main project. However, CMake 3.6 and +below do not also honor config-specific compiler flags such as those in the +:variable:`CMAKE__FLAGS_DEBUG` variable. CMake 3.7 and above prefer to +honor config-specific compiler flags too. This policy provides compatibility +for projects that do not expect config-specific compiler flags to be used. + +The ``OLD`` behavior of this policy is to ignore config-specific flag +variables like :variable:`CMAKE__FLAGS_DEBUG` and only use CMake's +built-in defaults for the current compiler and platform. + +The ``NEW`` behavior of this policy is to honor config-specific flag +variabldes like :variable:`CMAKE__FLAGS_DEBUG`. + +This policy was introduced in CMake version 3.7. Unlike most policies, +CMake version |release| does *not* warn by default when this policy +is not set and simply uses OLD behavior. See documentation of the +:variable:`CMAKE_POLICY_WARNING_CMP0066 >` +variable to control the warning. + +.. include:: DEPRECATED.txt diff --git a/Help/release/dev/try_compile-config-flags.rst b/Help/release/dev/try_compile-config-flags.rst new file mode 100644 index 000..ebfd6a4 --- /dev/null +++ b/Help/release/dev/try_compile-config-flags.rst @@ -0,0 +1,7 @@ +try_compile-config-flags + + +* The :command:`try_compile` command source file signature now honors + configuration-specific flags (e.g. :variable:`CMAKE__FLAGS_DEBUG`) + in the generated test project. Previously only the default such flags + for the current toolchain were used. See policy :policy:`CMP0066`. diff --git a/Help/variable/CMAKE_POLICY_WARNING_CMP.rst b/Help/variable/CMAKE_POLICY_WARNING_CMP.rst index 582f9e4..36cf75f 100644 --- a/Help/variable/CMAKE_POLICY_WARNING_CMP.rst +++ b/Help/variable/CMAKE_POLICY_WARNING_CMP.rst @
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-603-g3caf8ce
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 3caf8ce1fea07b10b0d9ee40d3d1366ac3a59aaa (commit) via 8d79375818efbaa06858a8e2d176ab8a251bef63 (commit) from 50c0cf86316fa416cb711da4f69dab9f18dafcea (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=3caf8ce1fea07b10b0d9ee40d3d1366ac3a59aaa commit 3caf8ce1fea07b10b0d9ee40d3d1366ac3a59aaa Merge: 50c0cf8 8d79375 Author: Brad King AuthorDate: Wed Jun 29 09:10:37 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 09:10:37 2016 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc3-284-g8d79375
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 8d79375818efbaa06858a8e2d176ab8a251bef63 (commit) via a9252441b3c03572808b15155f31b4e60b150d0e (commit) from 5e2c63807278ca036da30ca718af9177b2a3340d (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=8d79375818efbaa06858a8e2d176ab8a251bef63 commit 8d79375818efbaa06858a8e2d176ab8a251bef63 Merge: 5e2c638 a925244 Author: Brad King AuthorDate: Wed Jun 29 09:10:29 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 09:10:29 2016 -0400 Merge topic 'GenerateExportHeader-custom-content' a9252441 Tests: Run clang-format on GenerateExportHeader code --- Summary of changes: .../lib_shared_and_static/libshared_and_static.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-601-g50c0cf8
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 50c0cf86316fa416cb711da4f69dab9f18dafcea (commit) via a9252441b3c03572808b15155f31b4e60b150d0e (commit) from e0a1084ce058cff10e6359f85f86752e85437e16 (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=50c0cf86316fa416cb711da4f69dab9f18dafcea commit 50c0cf86316fa416cb711da4f69dab9f18dafcea Merge: e0a1084 a925244 Author: Brad King AuthorDate: Wed Jun 29 09:10:20 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 09:10:20 2016 -0400 Merge topic 'GenerateExportHeader-custom-content' into next a9252441 Tests: Run clang-format on GenerateExportHeader code https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9252441b3c03572808b15155f31b4e60b150d0e commit a9252441b3c03572808b15155f31b4e60b150d0e Author: Brad King AuthorDate: Wed Jun 29 09:09:54 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 09:09:54 2016 -0400 Tests: Run clang-format on GenerateExportHeader code diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp b/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp index 83b8f98..846c207 100644 --- a/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp +++ b/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp @@ -2,7 +2,7 @@ #include "libshared_and_static.h" #ifndef MY_CUSTOM_CONTENT_ADDED -# error "MY_CUSTOM_CONTENT_ADDED not defined!" +#error "MY_CUSTOM_CONTENT_ADDED not defined!" #endif int LibsharedAndStatic::libshared_and_static() const --- Summary of changes: .../lib_shared_and_static/libshared_and_static.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc3-278-gdb4ba61
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 db4ba61f3974258ad972a1594ee7b0d5b6f7a68c (commit) via 943fe6e3b40cde7eb927bb2e2acf049fe580c188 (commit) from b9b3ec4d98b03c180b2e6b9ad8edba7f75576353 (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=db4ba61f3974258ad972a1594ee7b0d5b6f7a68c commit db4ba61f3974258ad972a1594ee7b0d5b6f7a68c Merge: b9b3ec4 943fe6e Author: Brad King AuthorDate: Wed Jun 29 09:07:28 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 09:07:28 2016 -0400 Merge topic 'revert-try_compile-config-flags' 943fe6e3 Revert "try_compile: Honor CMAKE__FLAGS_ changes" --- Summary of changes: Help/release/3.6.rst |5 - Source/cmCoreTryCompile.cxx |8 Tests/RunCMake/try_compile/CompileFlags.cmake | 17 - Tests/RunCMake/try_compile/RunCMakeTest.cmake |1 - Tests/RunCMake/try_compile/src.c |3 --- 5 files changed, 34 deletions(-) delete mode 100644 Tests/RunCMake/try_compile/CompileFlags.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-599-ge0a1084
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 e0a1084ce058cff10e6359f85f86752e85437e16 (commit) via 5e2c63807278ca036da30ca718af9177b2a3340d (commit) via cb93dc048f80d2724fa22881327d92a4b7e3f503 (commit) via db4ba61f3974258ad972a1594ee7b0d5b6f7a68c (commit) from 724554c78f73c871c3b67a9498c1db15fd1c43f7 (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=e0a1084ce058cff10e6359f85f86752e85437e16 commit e0a1084ce058cff10e6359f85f86752e85437e16 Merge: 724554c 5e2c638 Author: Brad King AuthorDate: Wed Jun 29 09:07:44 2016 -0400 Commit: Brad King CommitDate: Wed Jun 29 09:07:44 2016 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc3-282-g5e2c638
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 5e2c63807278ca036da30ca718af9177b2a3340d (commit) via f05f5b01d0a690e5f3e06be2c702ee659433c326 (commit) from cb93dc048f80d2724fa22881327d92a4b7e3f503 (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=5e2c63807278ca036da30ca718af9177b2a3340d commit 5e2c63807278ca036da30ca718af9177b2a3340d Merge: cb93dc0 f05f5b0 Author: Brad King AuthorDate: Wed Jun 29 09:07:36 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 09:07:36 2016 -0400 Merge topic 'cmliblzma-static' f05f5b01 cmliblzma: always build as static library --- Summary of changes: Utilities/cmliblzma/CMakeLists.txt |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.6.0-rc3-280-gcb93dc0
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 cb93dc048f80d2724fa22881327d92a4b7e3f503 (commit) via 843402b04a72ec1f99f0f712c4eb73abbcb67cba (commit) from db4ba61f3974258ad972a1594ee7b0d5b6f7a68c (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=cb93dc048f80d2724fa22881327d92a4b7e3f503 commit cb93dc048f80d2724fa22881327d92a4b7e3f503 Merge: db4ba61 843402b Author: Brad King AuthorDate: Wed Jun 29 09:07:33 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 09:07:33 2016 -0400 Merge topic 'GenerateExportHeader-custom-content' 843402b0 GenerateExportHeader: Add option to specify custom content --- Summary of changes: .../dev/GenerateExportHeader-custom-content.rst |6 ++ Modules/GenerateExportHeader.cmake| 17 ++--- Modules/exportheader.cmake.in |2 +- .../lib_shared_and_static/CMakeLists.txt |3 +++ .../lib_shared_and_static/libshared_and_static.cpp|4 5 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 Help/release/dev/GenerateExportHeader-custom-content.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-595-g724554c
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 724554c78f73c871c3b67a9498c1db15fd1c43f7 (commit) via 4e8480db5425e0acbbd6394593417aab2a1fc3e5 (commit) from 0462af8138566f7d9d47cdfa087f65c89cb70a26 (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=724554c78f73c871c3b67a9498c1db15fd1c43f7 commit 724554c78f73c871c3b67a9498c1db15fd1c43f7 Merge: 0462af8 4e8480d Author: Daniel Pfeifer AuthorDate: Wed Jun 29 05:54:05 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 05:54:05 2016 -0400 Merge topic 'CM_OVERRIDE-cmTypeMacro' into next 4e8480db cmTypeMacro: mark overridden functions with CM_OVERRIDE https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e8480db5425e0acbbd6394593417aab2a1fc3e5 commit 4e8480db5425e0acbbd6394593417aab2a1fc3e5 Author: Tobias Hunger AuthorDate: Wed Jun 29 09:31:51 2016 +0200 Commit: Daniel Pfeifer CommitDate: Wed Jun 29 11:48:50 2016 +0200 cmTypeMacro: mark overridden functions with CM_OVERRIDE diff --git a/Source/cmTypeMacro.h b/Source/cmTypeMacro.h index 5c534c3..147eba8 100644 --- a/Source/cmTypeMacro.h +++ b/Source/cmTypeMacro.h @@ -15,7 +15,7 @@ // All subclasses of cmCommand or cmCTestGenericHandler should // invoke this macro. #define cmTypeMacro(thisClass, superclass)\ - virtual const char* GetNameOfClass() { return #thisClass; } \ + const char* GetNameOfClass() CM_OVERRIDE { return #thisClass; } \ typedef superclass Superclass; \ static bool IsTypeOf(const char* type) \ { \ @@ -24,7 +24,10 @@ } \ return Superclass::IsTypeOf(type);\ } \ - virtual bool IsA(const char* type) { return thisClass::IsTypeOf(type); }\ + bool IsA(const char* type) CM_OVERRIDE \ + { \ +return thisClass::IsTypeOf(type); \ + } \ static thisClass* SafeDownCast(cmObject* c) \ { \ if (c && c->IsA(#thisClass)) {\ --- Summary of changes: Source/cmTypeMacro.h |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-593-g0462af8
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 0462af8138566f7d9d47cdfa087f65c89cb70a26 (commit) via 3f77655d060ae48fabd9dc5c445cad813a70db42 (commit) via b9b3ec4d98b03c180b2e6b9ad8edba7f75576353 (commit) from c664b95b08f793808d881ed08919bfa1a7fce409 (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=0462af8138566f7d9d47cdfa087f65c89cb70a26 commit 0462af8138566f7d9d47cdfa087f65c89cb70a26 Merge: c664b95 3f77655 Author: Daniel Pfeifer AuthorDate: Wed Jun 29 05:36:48 2016 -0400 Commit: CMake Topic Stage CommitDate: Wed Jun 29 05:36:48 2016 -0400 Merge topic 'CM_OVERRIDE-clang' into next 3f77655d CM_OVERRIDE: fix feature test for clang b9b3ec4d CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f77655d060ae48fabd9dc5c445cad813a70db42 commit 3f77655d060ae48fabd9dc5c445cad813a70db42 Author: Daniel Pfeifer AuthorDate: Wed Jun 29 11:33:31 2016 +0200 Commit: Daniel Pfeifer CommitDate: Wed Jun 29 11:33:38 2016 +0200 CM_OVERRIDE: fix feature test for clang Clang refuses to default initialize an instance of a class that does not have a default constructor. Fix the check by adding default constructors. Don't use brace initialization like it is proposed in the error message. We want to test the override support independent from the support for brace initialization. diff --git a/Source/Checks/cm_cxx_override.cxx b/Source/Checks/cm_cxx_override.cxx index e196968..5a33fbb 100644 --- a/Source/Checks/cm_cxx_override.cxx +++ b/Source/Checks/cm_cxx_override.cxx @@ -1,11 +1,13 @@ struct Foo { + Foo() {} virtual ~Foo() {} virtual int test() const = 0; }; struct Bar : Foo { + Bar() {} ~Bar() override {} int test() const override { return 0; } }; --- Summary of changes: Source/CMakeVersion.cmake |2 +- Source/Checks/cm_cxx_override.cxx |2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits