[Cmake-commits] CMake branch, master, updated. v3.7.1-765-gb620772
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 b620772b11fe396194148ec4768bd59ad89fb91f (commit) from 0f37cd228e9668d981ff75f3e1c63d4f716b7e57 (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=b620772b11fe396194148ec4768bd59ad89fb91f commit b620772b11fe396194148ec4768bd59ad89fb91f Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Wed Dec 7 00:01:10 2016 -0500 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Dec 7 00:01:10 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d48f521..f1fca76 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 7) -set(CMake_VERSION_PATCH 20161206) +set(CMake_VERSION_PATCH 20161207) #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 branch, next, updated. v3.7.1-1590-gd393492
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 d3934925a02995e97af78199d9ff04a57aa737d6 (commit) via 5ff45960beaf4bc6a59d44fe1d0ab247e6db39dd (commit) from aa1fb2f40605bb2cc359a04875126cb1c274ee63 (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=d3934925a02995e97af78199d9ff04a57aa737d6 commit d3934925a02995e97af78199d9ff04a57aa737d6 Merge: aa1fb2f 5ff4596 Author: Brad KingAuthorDate: Tue Dec 6 15:18:46 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Dec 6 15:18:46 2016 -0500 Merge topic 'QtAutogen_Contain' into next 5ff45960 QtAutogen: Fix clang-tidy warnings https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ff45960beaf4bc6a59d44fe1d0ab247e6db39dd commit 5ff45960beaf4bc6a59d44fe1d0ab247e6db39dd Author: Brad King AuthorDate: Tue Dec 6 15:17:11 2016 -0500 Commit: Brad King CommitDate: Tue Dec 6 15:17:11 2016 -0500 QtAutogen: Fix clang-tidy warnings ``` Source/cmQtAutoGeneratorInitializer.cxx:348:21: warning: the const qualified variable 'targetName' is copy-constructed from a const reference; Source/cmQtAutoGeneratorInitializer.cxx:356:5: warning: don't use else after return Source/cmQtAutoGenerators.cxx:186:12: warning: redundant boolean literal in conditional return statement ``` diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index 70f92d8..f0847b1 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -345,7 +345,7 @@ static std::string RccGetExecutable(cmGeneratorTarget const* target, { cmLocalGenerator* lg = target->GetLocalGenerator(); - const std::string targetName = target->GetName(); + std::string const& targetName = target->GetName(); if (qtMajorVersion == "5") { cmGeneratorTarget* qt5Rcc = lg->FindGeneratorTargetToUse("Qt5::rcc"); if (!qt5Rcc) { @@ -353,7 +353,8 @@ static std::string RccGetExecutable(cmGeneratorTarget const* target, return std::string(); } return qt5Rcc->ImportedGetLocation(""); - } else if (qtMajorVersion == "4") { + } + if (qtMajorVersion == "4") { cmGeneratorTarget* qt4Rcc = lg->FindGeneratorTargetToUse("Qt4::rcc"); if (!qt4Rcc) { cmSystemTools::Error("Qt4::rcc target not found ", targetName.c_str()); diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index da5811c..eb513e5 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -182,11 +182,7 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, return false; } } - if (!this->WriteOldMocDefinitionsFile(targetDirectory)) { -return false; - } - - return true; + return this->WriteOldMocDefinitionsFile(targetDirectory); } bool cmQtAutoGenerators::ReadAutogenInfoFile( --- Summary of changes: Source/cmQtAutoGeneratorInitializer.cxx |5 +++-- Source/cmQtAutoGenerators.cxx |6 +- 2 files changed, 4 insertions(+), 7 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.7.1-1534-g637c24b
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 637c24bf527c7cf0ffc753a8fbe858e6b9a6fb35 (commit) via 0f37cd228e9668d981ff75f3e1c63d4f716b7e57 (commit) via 0290bfc35dee73fb534556700554536f1164caaf (commit) via 22f05b1d8c8c52babe62ab44e6f1864aa73164a0 (commit) via 9cf5fe22d0ac51a45d99823820a100ea02ab4305 (commit) via d6a1e2b90b40b8947141a1ab6ea4e7c5051d78c5 (commit) from a966ea50fcd6425f74e3e6982b9548490a4acb8d (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=637c24bf527c7cf0ffc753a8fbe858e6b9a6fb35 commit 637c24bf527c7cf0ffc753a8fbe858e6b9a6fb35 Merge: a966ea5 0f37cd2 Author: Brad KingAuthorDate: Tue Dec 6 09:27:06 2016 -0500 Commit: Brad King CommitDate: Tue Dec 6 09:27:06 2016 -0500 Merge branch 'master' into next --- 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.7.1-764-g0f37cd2
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 0f37cd228e9668d981ff75f3e1c63d4f716b7e57 (commit) via 027ce359ff7454ac0aca4d9a9208759ef4b9c8b7 (commit) from 0290bfc35dee73fb534556700554536f1164caaf (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=0f37cd228e9668d981ff75f3e1c63d4f716b7e57 commit 0f37cd228e9668d981ff75f3e1c63d4f716b7e57 Merge: 0290bfc 027ce35 Author: Brad KingAuthorDate: Tue Dec 6 09:26:25 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Dec 6 09:26:25 2016 -0500 Merge topic 'FindOpenGL-imported-targets' 027ce359 FindOpenGL: Provide imported targets for GL and GLU --- Summary of changes: Help/release/dev/FindOpenGL-imported-targets.rst |5 ++ Modules/FindOpenGL.cmake | 59 ++ Tests/CMakeLists.txt |4 ++ Tests/{FindGTest => FindOpenGL}/CMakeLists.txt |8 +-- Tests/FindOpenGL/Test/CMakeLists.txt | 14 + Tests/FindOpenGL/Test/main.c | 17 +++ 6 files changed, 103 insertions(+), 4 deletions(-) create mode 100644 Help/release/dev/FindOpenGL-imported-targets.rst copy Tests/{FindGTest => FindOpenGL}/CMakeLists.txt (54%) create mode 100644 Tests/FindOpenGL/Test/CMakeLists.txt create mode 100644 Tests/FindOpenGL/Test/main.c 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.7.1-757-g22f05b1
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 22f05b1d8c8c52babe62ab44e6f1864aa73164a0 (commit) via 7f307d9ea6e77ee6fd7081d464314a64cbf64f32 (commit) via 1b50bd3f5c1f608a84df89c2f5e187a53f0be31d (commit) from 9cf5fe22d0ac51a45d99823820a100ea02ab4305 (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=22f05b1d8c8c52babe62ab44e6f1864aa73164a0 commit 22f05b1d8c8c52babe62ab44e6f1864aa73164a0 Merge: 9cf5fe2 7f307d9 Author: Brad KingAuthorDate: Tue Dec 6 09:26:17 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Dec 6 09:26:17 2016 -0500 Merge topic 'update-kwsys' 7f307d9e Merge branch 'upstream-KWSys' into update-kwsys 1b50bd3f KWSys 2016-12-02 (4967ccc0) --- Summary of changes: Source/kwsys/CMakeLists.txt | 13 ++- Source/kwsys/ConsoleBuf.hxx.in |5 +- Source/kwsys/DynamicLoader.cxx | 154 +++--- Source/kwsys/EncodingCXX.cxx | 60 - Source/kwsys/testConsoleBuf.cxx | 33 ++-- Source/kwsys/testConsoleBuf.hxx |2 +- Source/kwsys/testConsoleBufChild.cxx |3 +- Source/kwsys/testEncoding.cxx| 31 +++ 8 files changed, 198 insertions(+), 103 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.7.1-762-g0290bfc
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 0290bfc35dee73fb534556700554536f1164caaf (commit) via df7fa47c1b42a360158f0b8596d177998fd4fa2d (commit) via f8a1ba202f51e70510f12f46fe0633ea908d5144 (commit) via 93cc249f3dd7ecd621cd063e4c08bbdb54d971e8 (commit) via 25d7b1ca9d3a160850ad1f147ff96ac7c55f7d9f (commit) from 22f05b1d8c8c52babe62ab44e6f1864aa73164a0 (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=0290bfc35dee73fb534556700554536f1164caaf commit 0290bfc35dee73fb534556700554536f1164caaf Merge: 22f05b1 df7fa47 Author: Brad KingAuthorDate: Tue Dec 6 09:26:20 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Dec 6 09:26:20 2016 -0500 Merge topic 'update-curl' df7fa47c curl: Disable symbol hiding logic in build for CMake f8a1ba20 Merge branch 'upstream-curl' into update-curl 93cc249f curl 2016-11-02 (3c561c65) 25d7b1ca curl: Update script to get curl 7.51.0 --- Summary of changes: Utilities/Scripts/update-curl.bash |2 +- Utilities/cmcurl/CMake/CurlSymbolHiding.cmake | 61 + Utilities/cmcurl/CMake/FindNGHTTP2.cmake| 18 ++ Utilities/cmcurl/CMakeLists.txt | 100 Utilities/cmcurl/include/curl/curl.h| 11 +- Utilities/cmcurl/include/curl/curlver.h |8 +- Utilities/cmcurl/lib/CMakeLists.txt |5 + Utilities/cmcurl/lib/Makefile.inc |8 +- Utilities/cmcurl/lib/amigaos.c |2 +- Utilities/cmcurl/lib/base64.c |5 + Utilities/cmcurl/lib/conncache.c|1 - Utilities/cmcurl/lib/connect.c | 33 +-- Utilities/cmcurl/lib/connect.h | 40 +++- Utilities/cmcurl/lib/cookie.c | 128 ++ Utilities/cmcurl/lib/cookie.h |4 +- Utilities/cmcurl/lib/curl_config.h.cmake|8 +- Utilities/cmcurl/lib/curl_ntlm_core.c | 37 ++- Utilities/cmcurl/lib/curl_sasl.c| 12 +- Utilities/cmcurl/lib/curl_setup.h | 24 +- Utilities/cmcurl/lib/curl_sspi.c| 20 +- Utilities/cmcurl/lib/curlx.h| 13 +- Utilities/cmcurl/lib/dict.c | 25 +- Utilities/cmcurl/lib/easy.c | 40 +--- Utilities/cmcurl/lib/escape.c | 34 ++- Utilities/cmcurl/lib/file.c | 11 +- Utilities/cmcurl/lib/formdata.c | 62 +++-- Utilities/cmcurl/lib/formdata.h |1 + Utilities/cmcurl/lib/ftp.c | 107 - Utilities/cmcurl/lib/ftp.h |4 +- Utilities/cmcurl/lib/ftplistparser.c|3 +- Utilities/cmcurl/lib/getenv.c |3 +- Utilities/cmcurl/lib/getinfo.c | 19 +- Utilities/cmcurl/lib/gopher.c | 37 ++- Utilities/cmcurl/lib/hostcheck.c| 14 +- Utilities/cmcurl/lib/hostip.c |7 +- Utilities/cmcurl/lib/http.c | 282 --- Utilities/cmcurl/lib/http.h |1 + Utilities/cmcurl/lib/http2.c| 172 +- Utilities/cmcurl/lib/http2.h|6 +- Utilities/cmcurl/lib/http_digest.c |2 +- Utilities/cmcurl/lib/http_negotiate.c |1 - Utilities/cmcurl/lib/http_ntlm.c|2 +- Utilities/cmcurl/lib/http_proxy.c | 18 +- Utilities/cmcurl/lib/if2ip.c|8 +- Utilities/cmcurl/lib/imap.c | 25 +- Utilities/cmcurl/lib/krb5.c | 12 +- Utilities/cmcurl/lib/ldap.c | 59 ++--- Utilities/cmcurl/lib/libcurl.rc |6 +- Utilities/cmcurl/lib/md5.c |2 +- Utilities/cmcurl/lib/mprintf.c | 26 ++- Utilities/cmcurl/lib/multi.c| 281 -- Utilities/cmcurl/lib/multiif.h |1 + Utilities/cmcurl/lib/netrc.c| 18 +- Utilities/cmcurl/lib/parsedate.c| 20 +- Utilities/cmcurl/lib/pingpong.c |3 +- Utilities/cmcurl/lib/pipeline.c | 12 +- Utilities/cmcurl/lib/pop3.c | 10 +- Utilities/cmcurl/lib/progress.c |
[Cmake-commits] CMake branch, master, updated. v3.7.1-754-g9cf5fe2
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 9cf5fe22d0ac51a45d99823820a100ea02ab4305 (commit) via 4beaa926b3f290c10824b2d04cd94fd44a9489d1 (commit) via 1b91e010bccaf1c93574c04197fb1e8b75b6c50a (commit) from d6a1e2b90b40b8947141a1ab6ea4e7c5051d78c5 (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=9cf5fe22d0ac51a45d99823820a100ea02ab4305 commit 9cf5fe22d0ac51a45d99823820a100ea02ab4305 Merge: d6a1e2b 4beaa92 Author: Brad KingAuthorDate: Tue Dec 6 09:26:12 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Dec 6 09:26:12 2016 -0500 Merge topic 'wix-reg-install-dir' 4beaa926 Help: Add notes for topic 'wix-reg-install-dir' 1b91e010 Utilities/Release: Store WiX CMake install location in Windows registry --- Summary of changes: Help/release/dev/wix-reg-install-dir.rst |6 ++ Utilities/Release/WiX/WIX.template.in| 13 - 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Help/release/dev/wix-reg-install-dir.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.7.1-1528-ga966ea5
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 a966ea50fcd6425f74e3e6982b9548490a4acb8d (commit) via 4beaa926b3f290c10824b2d04cd94fd44a9489d1 (commit) from 7f9e152943a1494fa784a86d7708dc6403a9a3d6 (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=a966ea50fcd6425f74e3e6982b9548490a4acb8d commit a966ea50fcd6425f74e3e6982b9548490a4acb8d Merge: 7f9e152 4beaa92 Author: Brad KingAuthorDate: Tue Dec 6 09:25:37 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Dec 6 09:25:37 2016 -0500 Merge topic 'wix-reg-install-dir' into next 4beaa926 Help: Add notes for topic 'wix-reg-install-dir' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4beaa926b3f290c10824b2d04cd94fd44a9489d1 commit 4beaa926b3f290c10824b2d04cd94fd44a9489d1 Author: Brad King AuthorDate: Tue Dec 6 09:23:42 2016 -0500 Commit: Brad King CommitDate: Tue Dec 6 09:25:00 2016 -0500 Help: Add notes for topic 'wix-reg-install-dir' diff --git a/Help/release/dev/wix-reg-install-dir.rst b/Help/release/dev/wix-reg-install-dir.rst new file mode 100644 index 000..961fad2 --- /dev/null +++ b/Help/release/dev/wix-reg-install-dir.rst @@ -0,0 +1,6 @@ +wix-reg-install-dir +--- + +* The precompiled Windows binary MSI package provided on ``cmake.org`` now + records the installation directory in the Windows Registry under the key + ``HKLM\Software\Kitware\CMake`` with a value named ``InstallDir``. --- Summary of changes: Help/release/dev/wix-reg-install-dir.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/wix-reg-install-dir.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.7.1-1526-g7f9e152
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 7f9e152943a1494fa784a86d7708dc6403a9a3d6 (commit) via f72ba42b7c643b1b217d1b8f6684cec3289e7201 (commit) via 45aa03b97aeeb512264ac2bfbb2028330be254d1 (commit) via 3bb2051eef5c3a07f99e9e6549187211758317d6 (commit) from 258901cd19d9bee049e65ae347536255b00fbe9d (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=7f9e152943a1494fa784a86d7708dc6403a9a3d6 commit 7f9e152943a1494fa784a86d7708dc6403a9a3d6 Merge: 258901c f72ba42 Author: Brad KingAuthorDate: Tue Dec 6 08:59:11 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Dec 6 08:59:11 2016 -0500 Merge topic 'try_compile-lang-std' into next f72ba42b try_compile: Add policy CMP0067 to honor language standards 45aa03b9 try_compile: Add options to specify language standards 3bb2051e try_compile: Stop processing when test build system fails to generate https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f72ba42b7c643b1b217d1b8f6684cec3289e7201 commit f72ba42b7c643b1b217d1b8f6684cec3289e7201 Author: Brad King AuthorDate: Thu Dec 1 15:46:34 2016 -0500 Commit: Brad King CommitDate: Tue Dec 6 08:58:42 2016 -0500 try_compile: Add policy CMP0067 to honor language standards Projects use `try_compile` to check if they will be able to compile some particular source code. When a language standard variable like `CMAKE_CXX_STANDARD` is set, then the project intends to compile source code using a compiler mode for that standard. Therefore it makes sense for `try_compile` to use that standard in the test project too. Unfortunately this was not done when support for the `CMAKE_CXX_STANDARD` variable was first implemented. Add a policy to introduce the improved behavior in a compatible way. Closes: #16456 diff --git a/Help/command/try_compile.rst b/Help/command/try_compile.rst index 3f16b63..cde3776 100644 --- a/Help/command/try_compile.rst +++ b/Help/command/try_compile.rst @@ -135,3 +135,17 @@ the type of target used for the source file signature. Set the :variable:`CMAKE_TRY_COMPILE_PLATFORM_VARIABLES` variable to specify variables that must be propagated into the test project. This variable is meant for use only in toolchain files. + +If :policy:`CMP0067` is set to ``NEW``, or any of the ``_STANDARD``, +``_STANDARD_REQUIRED``, or ``_EXTENSIONS`` options are used, +then the language standard variables are honored: + +* :variable:`CMAKE_C_STANDARD` +* :variable:`CMAKE_C_STANDARD_REQUIRED` +* :variable:`CMAKE_C_EXTENSIONS` +* :variable:`CMAKE_CXX_STANDARD` +* :variable:`CMAKE_CXX_STANDARD_REQUIRED` +* :variable:`CMAKE_CXX_EXTENSIONS` + +Their values are used to set the corresponding target properties in +the generated project (unless overridden by an explicit option). diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst index 0cfe983..3266958 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.8 + + +.. toctree:: + :maxdepth: 1 + + CMP0067: Honor language standard in try_compile() source-file signature. + Policies Introduced by CMake 3.7 diff --git a/Help/policy/CMP0067.rst b/Help/policy/CMP0067.rst new file mode 100644 index 000..d52ba7f --- /dev/null +++ b/Help/policy/CMP0067.rst @@ -0,0 +1,34 @@ +CMP0067 +--- + +Honor language standard in :command:`try_compile` source-file signature. + +The :command:`try_compile` source file signature is intended to allow +callers to check whether they will be able to compile a given source file +with the current toolchain. In order to match compiler behavior, any +language standard mode should match. However, CMake 3.7 and below did not +do this. CMake 3.8 and above prefer to honor the language standard settings +for ``C`` and ``CXX`` (C++) using the values of the variables: + +* :variable:`CMAKE_C_STANDARD` +* :variable:`CMAKE_C_STANDARD_REQUIRED` +* :variable:`CMAKE_C_EXTENSIONS` +* :variable:`CMAKE_CXX_STANDARD` +* :variable:`CMAKE_CXX_STANDARD_REQUIRED` +* :variable:`CMAKE_CXX_EXTENSIONS` + +This policy provides compatibility for projects that do not expect +the language standard settings to be used automatically. +
[Cmake-commits] CMake branch, next, updated. v3.7.1-1522-g258901c
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 258901cd19d9bee049e65ae347536255b00fbe9d (commit) via b8d9541aead07ddca4152d232c20924fd906a1f2 (commit) from 860ad8e96ac20c8fb77ee853b7c18b15db1747f1 (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=258901cd19d9bee049e65ae347536255b00fbe9d commit 258901cd19d9bee049e65ae347536255b00fbe9d Merge: 860ad8e b8d9541 Author: Brad KingAuthorDate: Tue Dec 6 08:58:24 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Dec 6 08:58:24 2016 -0500 Merge topic 'try_compile-lang-std' into next b8d9541a fixup! try_compile: Add options to specify language standards https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8d9541aead07ddca4152d232c20924fd906a1f2 commit b8d9541aead07ddca4152d232c20924fd906a1f2 Author: Brad King AuthorDate: Tue Dec 6 08:37:01 2016 -0500 Commit: Brad King CommitDate: Tue Dec 6 08:51:55 2016 -0500 fixup! try_compile: Add options to specify language standards diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 5eb39bb..1b88d46 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -215,14 +215,19 @@ add_RunCMake_test(project -DCMake_TEST_RESOURCES=${CMake_TEST_RESOURCES}) add_RunCMake_test(return) add_RunCMake_test(set_property) add_RunCMake_test(string) -add_RunCMake_test(try_compile - -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID} - -DCMAKE_C_COMPILER_VERSION=${CMAKE_C_COMPILER_VERSION} - -DCMAKE_C_STANDARD_DEFAULT=${CMAKE_C_STANDARD_DEFAULT} - -DCMAKE_CXX_COMPILER_ID=${CMAKE_CXX_COMPILER_ID} - -DCMAKE_CXX_COMPILER_VERSION=${CMAKE_CXX_COMPILER_VERSION} - -DCMAKE_CXX_STANDARD_DEFAULT=${CMAKE_CXX_STANDARD_DEFAULT} - ) +foreach(var +CMAKE_C_COMPILER_ID +CMAKE_C_COMPILER_VERSION +CMAKE_C_STANDARD_DEFAULT +CMAKE_CXX_COMPILER_ID +CMAKE_CXX_COMPILER_VERSION +CMAKE_CXX_STANDARD_DEFAULT +) + if(DEFINED ${var}) +list(APPEND try_compile_ARGS -D${var}=${${var}}) + endif() +endforeach() +add_RunCMake_test(try_compile) add_RunCMake_test(try_run) add_RunCMake_test(set) add_RunCMake_test(variable_watch) diff --git a/Tests/RunCMake/try_compile/CxxStandardGNU.cxx b/Tests/RunCMake/try_compile/CxxStandardGNU.cxx index 6ea1792..7990a78 100644 --- a/Tests/RunCMake/try_compile/CxxStandardGNU.cxx +++ b/Tests/RunCMake/try_compile/CxxStandardGNU.cxx @@ -1,4 +1,5 @@ -#if __cplusplus != 201103L +#if __cplusplus != 201103L && \ + !(__cplusplus < 201103L && defined(__GXX_EXPERIMENTAL_CXX0X__)) #error "Not GNU C++ 11 mode!" #endif #ifndef __STRICT_ANSI__ diff --git a/Tests/RunCMake/try_compile/RunCMakeTest.cmake b/Tests/RunCMake/try_compile/RunCMakeTest.cmake index 67068c0..d1b0217 100644 --- a/Tests/RunCMake/try_compile/RunCMakeTest.cmake +++ b/Tests/RunCMake/try_compile/RunCMakeTest.cmake @@ -27,12 +27,12 @@ run_cmake(TargetTypeStatic) if(CMAKE_C_STANDARD_DEFAULT) run_cmake(CStandard) -else() +elseif(DEFINED CMAKE_C_STANDARD_DEFAULT) run_cmake(CStandardNoDefault) endif() if(CMAKE_CXX_STANDARD_DEFAULT) run_cmake(CxxStandard) -else() +elseif(DEFINED CMAKE_CXX_STANDARD_DEFAULT) run_cmake(CxxStandardNoDefault) endif() if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) --- Summary of changes: Tests/RunCMake/CMakeLists.txt | 21 + Tests/RunCMake/try_compile/CxxStandardGNU.cxx |3 ++- Tests/RunCMake/try_compile/RunCMakeTest.cmake |4 ++-- 3 files changed, 17 insertions(+), 11 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.7.1-1520-g860ad8e
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 860ad8e96ac20c8fb77ee853b7c18b15db1747f1 (commit) via df7fa47c1b42a360158f0b8596d177998fd4fa2d (commit) from 3b96df21e3d3ca0b3be6403263a6d0b33ddf20b4 (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=860ad8e96ac20c8fb77ee853b7c18b15db1747f1 commit 860ad8e96ac20c8fb77ee853b7c18b15db1747f1 Merge: 3b96df2 df7fa47 Author: Brad KingAuthorDate: Tue Dec 6 08:28:21 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Dec 6 08:28:21 2016 -0500 Merge topic 'update-curl' into next df7fa47c curl: Disable symbol hiding logic in build for CMake https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df7fa47c1b42a360158f0b8596d177998fd4fa2d commit df7fa47c1b42a360158f0b8596d177998fd4fa2d Author: Brad King AuthorDate: Tue Dec 6 08:17:57 2016 -0500 Commit: Brad King CommitDate: Tue Dec 6 08:18:33 2016 -0500 curl: Disable symbol hiding logic in build for CMake We already disable the code using `HIDES_CURL_PRIVATE_SYMBOLS`, so skip the code to set it too, thus avoiding unnecessary `message()` calls. diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 4a91017..262554d 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -183,7 +183,9 @@ if(MSVC) mark_as_advanced(BUILD_RELEASE_DEBUG_DIRS) endif() +if(0) # This code not needed for building within CMake. include(CurlSymbolHiding) +endif() option(HTTP_ONLY "disables all protocols except HTTP (This overrides all CURL_DISABLE_* options)" OFF) mark_as_advanced(HTTP_ONLY) --- Summary of changes: Utilities/cmcurl/CMakeLists.txt |2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits