[Cmake-commits] CMake branch, master, updated. v3.15.0-rc1-25-ge2414ee
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 e2414ee13d1fad8b6775581d01975109c9867854 (commit) from 0b3ba05a9beada98e8e97445acef7ef2f4efb3e3 (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=e2414ee13d1fad8b6775581d01975109c9867854 commit e2414ee13d1fad8b6775581d01975109c9867854 Author: Kitware Robot AuthorDate: Fri Jun 7 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Fri Jun 7 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 381fbe3..07def95 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 15) -set(CMake_VERSION_PATCH 20190606) +set(CMake_VERSION_PATCH 20190607) #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 https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.15.0-rc1-24-g0b3ba05
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 0b3ba05a9beada98e8e97445acef7ef2f4efb3e3 (commit) via 0e4493ec67865123d43034ef9bf1bd4919c705b1 (commit) via f1bdfdf2425d544b0cf897de626422ad3fa9e1e7 (commit) via 8af4b31b8ac44c87629fabec22d87e1e6e41f73f (commit) via 537ea119b9d65d8723b6df8a7ba71f29466c0f63 (commit) via c4826787d50d02a8e403b99b589a35875e7d7f23 (commit) from 6aee82f325df2332b5c7563c3e10b3253ae851c1 (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=0b3ba05a9beada98e8e97445acef7ef2f4efb3e3 commit 0b3ba05a9beada98e8e97445acef7ef2f4efb3e3 Merge: 6aee82f 0e4493e Author: Brad King AuthorDate: Thu Jun 6 18:07:12 2019 + Commit: Kitware Robot CommitDate: Thu Jun 6 14:07:23 2019 -0400 Merge topic 'cmTarget_cleanups' 0e4493ec67 cmOutputConverter: Initialize static std::set on construction f1bdfdf242 cmAddCustomCommand: Initialize static std::unordered_set on construction 8af4b31b8a cmTargetPropertyComputer: Initialize static std::unordered_set on construction 537ea119b9 cmTarget: Initialize static std::unordered_set on construction c4826787d5 cmTarget: Property initialization cleanup Acked-by: Kitware Robot Merge-request: !3416 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e4493ec67865123d43034ef9bf1bd4919c705b1 commit 0e4493ec67865123d43034ef9bf1bd4919c705b1 Author: Sebastian Holtermann AuthorDate: Tue Jun 4 12:24:44 2019 +0200 Commit: Sebastian Holtermann CommitDate: Tue Jun 4 18:11:19 2019 +0200 cmOutputConverter: Initialize static std::set on construction diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx index 7d88b08..d7bcf7e 100644 --- a/Source/cmOutputConverter.cxx +++ b/Source/cmOutputConverter.cxx @@ -73,22 +73,10 @@ std::string cmOutputConverter::ConvertDirectorySeparatorsForShell( static bool cmOutputConverterIsShellOperator(const std::string& str) { - static std::set shellOperators; - if (shellOperators.empty()) { -shellOperators.insert("<"); -shellOperators.insert(">"); -shellOperators.insert("<<"); -shellOperators.insert(">>"); -shellOperators.insert("|"); -shellOperators.insert("||"); -shellOperators.insert("&&"); -shellOperators.insert("&>"); -shellOperators.insert("1>"); -shellOperators.insert("2>"); -shellOperators.insert("2>&1"); -shellOperators.insert("1>&2"); - } - return shellOperators.count(str) > 0; + static std::set const shellOperators{ +"<", ">", "<<", ">>", "|", "||", "&&", "&>", "1>", "2>", "2>&1", "1>&2" + }; + return (shellOperators.count(str) != 0); } std::string cmOutputConverter::EscapeForShell(const std::string& str, https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1bdfdf2425d544b0cf897de626422ad3fa9e1e7 commit f1bdfdf2425d544b0cf897de626422ad3fa9e1e7 Author: Sebastian Holtermann AuthorDate: Tue Jun 4 12:19:59 2019 +0200 Commit: Sebastian Holtermann CommitDate: Tue Jun 4 18:11:19 2019 +0200 cmAddCustomCommand: Initialize static std::unordered_set on construction diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx index 0be3c85..6eb38bd 100644 --- a/Source/cmAddCustomCommandCommand.cxx +++ b/Source/cmAddCustomCommandCommand.cxx @@ -95,30 +95,29 @@ bool cmAddCustomCommandCommand::InitialPass( MAKE_STATIC_KEYWORD(VERBATIM); MAKE_STATIC_KEYWORD(WORKING_DIRECTORY); #undef MAKE_STATIC_KEYWORD - static std::unordered_set keywords; - if (keywords.empty()) { -keywords.insert(keyAPPEND); -keywords.insert(keyARGS); -keywords.insert(keyBYPRODUCTS); -keywords.insert(keyCOMMAND); -keywords.insert(keyCOMMAND_EXPAND_LISTS); -keywords.insert(keyCOMMENT); -keywords.insert(keyDEPENDS); -keywords.insert(keyDEPFILE); -keywords.insert(keyIMPLICIT_DEPENDS); -keywords.insert(keyJOB_POOL); -keywords.insert(keyMAIN_DEPENDENCY); -keywords.insert(keyOUTPUT); -keywords.insert(keyOUTPUTS); -keywords.insert(keyPOST_BUILD); -keywords.insert(keyPRE_BUILD); -keywords.insert(keyPRE_LINK); -keywords.insert(keySOURCE); -keywords.insert(keyTARGET); -keywords.insert(keyUSES_TERMINAL); -keywords.insert(keyVERBATIM); -keywords.insert(keyWORKING_DIRECTORY); - } + static std::unordered_set const keywords{ +keyAPPEND, +keyARGS, +keyBYPRODUCTS, +keyCOMMAND, +keyCOMMAND_EXPAND_LISTS, +keyCOMMENT, +keyDEPENDS, +keyDEPFILE, +keyIMPLICIT_DEPENDS, +keyJOB_POOL, +keyMAIN_DEPENDENCY, +keyOUTPUT, +keyOU
[Cmake-commits] CMake branch, master, updated. v3.15.0-rc1-18-g6aee82f
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 6aee82f325df2332b5c7563c3e10b3253ae851c1 (commit) via 676a0bf9bc97a8a4820d3ba4deb34cb14cbb5fe0 (commit) via 1f466935da2b04862307d126da0cf4d6b604d613 (commit) via 923f58ec735575a3e81f017c5dcdecb15f44a668 (commit) via 501a3cf195fc8b189d310c499d37ade63a7abb1d (commit) from baf3a84eff415be8691724153a10031401321d0f (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=6aee82f325df2332b5c7563c3e10b3253ae851c1 commit 6aee82f325df2332b5c7563c3e10b3253ae851c1 Merge: 676a0bf 1f46693 Author: Brad King AuthorDate: Thu Jun 6 10:34:32 2019 -0400 Commit: Brad King CommitDate: Thu Jun 6 10:34:32 2019 -0400 Merge branch 'release-3.15' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=676a0bf9bc97a8a4820d3ba4deb34cb14cbb5fe0 commit 676a0bf9bc97a8a4820d3ba4deb34cb14cbb5fe0 Merge: baf3a84 923f58e Author: Brad King AuthorDate: Thu Jun 6 14:32:12 2019 + Commit: Kitware Robot CommitDate: Thu Jun 6 10:33:06 2019 -0400 Merge topic 'doc-xlclang-id' 923f58ec73 Help: Document XLClang compiler id Acked-by: Kitware Robot Merge-request: !3430 --- Summary of changes: Help/variable/CMAKE_LANG_COMPILER_ID.rst | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.15.0-rc1-6-g1f46693
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 1f466935da2b04862307d126da0cf4d6b604d613 (commit) via 923f58ec735575a3e81f017c5dcdecb15f44a668 (commit) via 501a3cf195fc8b189d310c499d37ade63a7abb1d (commit) via 8a4732c60e5cb2137fa824605e4668f3229a9684 (commit) from 556277eb100c2fa061677a59be33eb71876a2a72 (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/variable/CMAKE_LANG_COMPILER_ID.rst | 1 + Modules/Internal/CPack/CPackNuGet.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.15.0-rc1-13-gbaf3a84
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 baf3a84eff415be8691724153a10031401321d0f (commit) via 8a4732c60e5cb2137fa824605e4668f3229a9684 (commit) from 9ef92b7d7d577350cc67c7762112b6056adef34d (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=baf3a84eff415be8691724153a10031401321d0f commit baf3a84eff415be8691724153a10031401321d0f Merge: 9ef92b7 8a4732c Author: Brad King AuthorDate: Thu Jun 6 14:32:02 2019 + Commit: Kitware Robot CommitDate: Thu Jun 6 10:32:10 2019 -0400 Merge topic 'cpack-nuget-case' 8a4732c60e CPack/NuGet: Find nuget tool on case sensitive file system Acked-by: Kitware Robot Acked-by: Mathieu Malaterre Merge-request: !3427 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a4732c60e5cb2137fa824605e4668f3229a9684 commit 8a4732c60e5cb2137fa824605e4668f3229a9684 Author: Mathieu Malaterre AuthorDate: Wed Jun 5 10:17:21 2019 +0200 Commit: Brad King CommitDate: Wed Jun 5 09:32:22 2019 -0400 CPack/NuGet: Find nuget tool on case sensitive file system There is no need to use a CamelCase executable name since it will be handled gracefully on Windows anyway. This change allow support for Linux system, in particular Debian distribution where the binary is called `nuget`. diff --git a/Modules/Internal/CPack/CPackNuGet.cmake b/Modules/Internal/CPack/CPackNuGet.cmake index 198ccad..4b2ce92 100644 --- a/Modules/Internal/CPack/CPackNuGet.cmake +++ b/Modules/Internal/CPack/CPackNuGet.cmake @@ -276,7 +276,7 @@ function(_cpack_nuget_make_files_tag) set(_CPACK_NUGET_FILES_TAG "\n${_files}" PARENT_SCOPE) endfunction() -find_program(NUGET_EXECUTABLE NuGet) +find_program(NUGET_EXECUTABLE nuget) _cpack_nuget_debug_var(NUGET_EXECUTABLE) if(NOT NUGET_EXECUTABLE) message(FATAL_ERROR "NuGet executable not found") --- Summary of changes: Modules/Internal/CPack/CPackNuGet.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits