[Cmake-commits] CMake branch, master, updated. v3.16.0-rc4-366-g843936f51b
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 843936f51b4f409d3106857a3954ff2db669becd (commit) from 6eaa355e90dc5b08e76123dc96386442c18d2528 (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=843936f51b4f409d3106857a3954ff2db669becd commit 843936f51b4f409d3106857a3954ff2db669becd Author: Kitware Robot AuthorDate: Tue Nov 19 00:01:12 2019 -0500 Commit: Kitware Robot CommitDate: Tue Nov 19 00:01:12 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 743996f91d..8a606d4b6f 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191118) +set(CMake_VERSION_PATCH 20191119) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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 annotated tag, v3.16.0-rc4, created. v3.16.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.16.0-rc4 has been created at 16e5bdfa421adeb28298484be3d8a2e675eb971c (tag) tagging d25d75687d3fe53ab19b61b5d671c83d8203f15c (commit) replaces v3.16.0-rc3 tagged by Brad King on Mon Nov 18 16:42:15 2019 -0500 - Log - CMake 3.16.0-rc4 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl3TEDcWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhES4D/98iUU7nYKu9m+mXAl49Ja2R8+X am6FkwyIinv3L1IUPx+/6ykUfxaajJp/aeG4k2vuVqUknjBUYlYcE6oNtKEch++0 x1jd3XPK8gWNK/yRnHRQXR7t0MigcvckeAkw9TaxLv9BGGlfpdEtWctokW6mpDQ/ 5IcNT94ZRmBjY7AmOTKLPALc3FV//trsETpxp1Hn69gz/cL4nje++hemhY/+1Us6 SFRjrF9GelZ9IQp9My+tkM5et7yLTp+CgmCdzV5Ql1GgsMNBHpNnbX1sLlasF6El +4cS35YBlwxW1OX91FT7EIARNhFoH10da+duaBil1Ql6ou0Tv4ZmP7IDP+6tgyMS amThAATle1nmfy0+yCbSC1EtSBH5coKMTwfa7P0i4Xg8OLdiALQNB5/6XGuchk1D lz246E9LEozLh4QMJTwLaFDmay8LBTiHrzjUUAWJ2cuuXuPwrtUATYKllwrRIWAr gRX1UmYJW7JRtjlTOuG/XHq+BmFFhPQ8Sqn+GEFmB1ksFQySqAlS+nhO5jUp5xzl qX7T3oPbTM93/HlKr2+UTeFLehfrYMWYDbfF5mxC4gMBjlGyBoxOZpOr0OMCL9T4 1RWSG52lBP176ZNNQOk/Js0AkGT6jdkXPV6IBB2iTCjU/+5XWWyCZJJDgdHU4mcF AiGyvlgL+HRExwA25g== =d7BX -END PGP SIGNATURE- Alex Turbov (1): CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS Arkadiusz Drabczyk (1): Tutorial: replace Unicode EN DASH with ASCII dash Ben Boeckel (3): Help: drop confusing reference to `if()` from `$` FindPostgreSQL: support version encoding used in pre-10 releases FindPostgreSQL: also search for libraries in the MacPorts suffix Brad King (63): Merge branch 'clarify-BOOL-genex-eval' into release-3.16 Merge branch 'fix_load_cache_docs' into release-3.16 Merge branch 'update-compile-feature-supported-compiler-list' into release-3.16 Merge branch 'FindwxWidgets-wxwin-313' into release-3.16 Merge branch 'root-dir-assertion-fix' into release-3.16 Merge branch 'tutorial-cleanup' into release-3.16 Merge branch 'docs-INSTALL_REMOVE_ENVIRONMENT_PATH' into release-3.16 Merge branch 'clarify_compile_features_documentation' into release-3.16 Merge branch 'objc-pch' into release-3.16 Merge branch 'source_group-tree' into release-3.16 Merge branch 'findpostgres-10-and-older' into release-3.16 CTest: Rename PROCESSES test property to RESOURCE_GROUPS CTest: Rename "Processes" lexer to "ResourceGroups" Help/dev: Update maintainer guide for Discourse transition cmGlobalXCodeGenerator: Mark known source locations Xcode: Fix generated references to CMakeLists.txt files CMakeCPack: Update Debian package contact email Help: Replace links to mailing lists with links to our Discourse Forum README: Update links to cmake.org pages README: Replace link to mailing list the CMake Discourse Forum CMakeSystemSpecificInformation: Replace mailing list with Discourse Forum Merge topic 'xcode-restore-CMakeLists' into release-3.16 Merge topic 'FindBoost-meta-component-ALL' into release-3.16 Merge topic 'objc-x-objc' into release-3.16 Merge topic 'llvm-rc-fix' into release-3.16 Merge topic 'unity-include-generated' into release-3.16 FindBinUtils: Revert "Use the compiler to get the path to compiler tools" Merge topic 'revert-FindBinUtils-ask-compiler' into release-3.16 Help: Document target_precompile_headers genex with angle brackets Merge topic 'doc-pch-genex' into release-3.16 CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docs Merge topic 'CTestCoverageCollectGCOV-typo' into release-3.16 Merge topic 'objc-link-main' into release-3.16 Merge topic 'objc-trycompile' into release-3.16 expat: Update script to get Expat 2.2.9 Merge branch 'upstream-expat' into update-expat expat: Update CMake build for 2.2.9 Tests: Fix ExportImport PCH expectation on Cray Classic compiler Tests: Add RunCMake.CPackCommandLine case for multi-config package Merge topic 'resolve-full-path-at-generate-time' into release-3.16 Merge topic 'pch-cray-classic' into release-3.16 Merge topic 'reference-IMPORTED_IMPLIB-more' into release-3.16 Merge topic 'update-expat' into release-3.16 Merge topic 'objc-xcode-flags' into release-3.16 Merge topic 'objc-standard-docs' into release-3.16 Merge topic 'unity-HEADER_FILE_ONLY' into release-3.16 Merge topic 'swift-rpath-separator' into release-3.16 Merge topic 'FindwxWidgets-qt' into release-3.16 Merge topic 'objc-standard' into release-3.16 Merge topic 'FindwxWidgets-mingw' into release-3.16 Tests: Organize Objective C/C++ test directories Merge topic 'FindPostgreSQL-macports-libsuffix' into release-3.16
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-490-g6eaa355e90
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 6eaa355e90dc5b08e76123dc96386442c18d2528 (commit) via d25d75687d3fe53ab19b61b5d671c83d8203f15c (commit) from 9112933a6cb398daade678c1bada5e363dcab09c (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=6eaa355e90dc5b08e76123dc96386442c18d2528 commit 6eaa355e90dc5b08e76123dc96386442c18d2528 Merge: 9112933a6c d25d75687d Author: Brad King AuthorDate: Mon Nov 18 17:02:37 2019 -0500 Commit: Brad King CommitDate: Mon Nov 18 17:02:37 2019 -0500 Merge branch 'release-3.16' --- Summary of changes: 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.16.0-rc3-125-gd25d75687d
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 d25d75687d3fe53ab19b61b5d671c83d8203f15c (commit) from 3a87ce6c962d2b5b0661d7b611070adf7077b27b (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 https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-488-g9112933a6c
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 9112933a6cb398daade678c1bada5e363dcab09c (commit) via 9c9bbedd31bccd77beac6851b81831469b176d4d (commit) via 3a87ce6c962d2b5b0661d7b611070adf7077b27b (commit) via ff6c336127973d09ac7d20f846854bdebf384201 (commit) from 3bc808fc3315d459a7d029645a9e892b7abcaa9a (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=9112933a6cb398daade678c1bada5e363dcab09c commit 9112933a6cb398daade678c1bada5e363dcab09c Merge: 9c9bbedd31 3a87ce6c96 Author: Brad King AuthorDate: Mon Nov 18 18:42:02 2019 + Commit: Kitware Robot CommitDate: Mon Nov 18 13:43:12 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c9bbedd31bccd77beac6851b81831469b176d4d commit 9c9bbedd31bccd77beac6851b81831469b176d4d Merge: 3bc808fc33 ff6c336127 Author: Brad King AuthorDate: Mon Nov 18 18:42:02 2019 + Commit: Kitware Robot CommitDate: Mon Nov 18 13:43:11 2019 -0500 Merge topic 'swift-rpath-darwin' ff6c336127 Swift: support `-rpath` on Darwin Acked-by: Kitware Robot Merge-request: !4059 --- Summary of changes: Modules/CMakeSwiftInformation.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, release, updated. v3.16.0-rc3-124-g3a87ce6c96
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 3a87ce6c962d2b5b0661d7b611070adf7077b27b (commit) via ff6c336127973d09ac7d20f846854bdebf384201 (commit) from 4bbd9e9ec4cf234df82f7d25449f3f3a8406979a (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: Modules/CMakeSwiftInformation.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.16.0-rc3-484-g3bc808fc33
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 3bc808fc3315d459a7d029645a9e892b7abcaa9a (commit) via eead6a25049d1186a99914fed41d5b692045f051 (commit) via 4bbd9e9ec4cf234df82f7d25449f3f3a8406979a (commit) via f935de6746f676dd435c09ca161a46aa289faf3b (commit) from cbedead9a25c12272918f1f70c8a1e1417605728 (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=3bc808fc3315d459a7d029645a9e892b7abcaa9a commit 3bc808fc3315d459a7d029645a9e892b7abcaa9a Merge: eead6a2504 4bbd9e9ec4 Author: Brad King AuthorDate: Mon Nov 18 18:41:58 2019 + Commit: Kitware Robot CommitDate: Mon Nov 18 13:42:09 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eead6a25049d1186a99914fed41d5b692045f051 commit eead6a25049d1186a99914fed41d5b692045f051 Merge: cbedead9a2 f935de6746 Author: Brad King AuthorDate: Mon Nov 18 18:41:58 2019 + Commit: Kitware Robot CommitDate: Mon Nov 18 13:42:09 2019 -0500 Merge topic 'swift-darwin-install-name' f935de6746 Swift: support `INSTALL_NAME_DIR` on Darwin Acked-by: Kitware Robot Merge-request: !4060 --- Summary of changes: Modules/CMakeSwiftInformation.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, release, updated. v3.16.0-rc3-122-g4bbd9e9ec4
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 4bbd9e9ec4cf234df82f7d25449f3f3a8406979a (commit) via f935de6746f676dd435c09ca161a46aa289faf3b (commit) from e64d39eb42a13f3a8d0e3d005a2936a27a2c8257 (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: Modules/CMakeSwiftInformation.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, release, updated. v3.16.0-rc3-120-ge64d39eb42
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 e64d39eb42a13f3a8d0e3d005a2936a27a2c8257 (commit) via 229f2cc5fd1ae26988b9ce71a0d9245a1709d674 (commit) from 1c09b8c164e0efd8fe82bb783d014e09e0285a0e (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/manual/cmake-compile-features.7.rst | 7 ++- 1 file changed, 6 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.16.0-rc3-480-gcbedead9a2
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 cbedead9a25c12272918f1f70c8a1e1417605728 (commit) via 26f3cb32883f4e9c49b290557669020a729cc9f1 (commit) via e64d39eb42a13f3a8d0e3d005a2936a27a2c8257 (commit) via 229f2cc5fd1ae26988b9ce71a0d9245a1709d674 (commit) from 776d1e5e79ab5194a39ea53252703bf3cc13c118 (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=cbedead9a25c12272918f1f70c8a1e1417605728 commit cbedead9a25c12272918f1f70c8a1e1417605728 Merge: 26f3cb3288 e64d39eb42 Author: Brad King AuthorDate: Mon Nov 18 14:53:57 2019 + Commit: Kitware Robot CommitDate: Mon Nov 18 09:54:15 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26f3cb32883f4e9c49b290557669020a729cc9f1 commit 26f3cb32883f4e9c49b290557669020a729cc9f1 Merge: 776d1e5e79 229f2cc5fd Author: Brad King AuthorDate: Mon Nov 18 14:53:57 2019 + Commit: Kitware Robot CommitDate: Mon Nov 18 09:54:15 2019 -0500 Merge topic 'compile-features-other-lang' 229f2cc5fd Help: Clarify compile features handling for OBJC and OBJCXX Acked-by: Kitware Robot Merge-request: !4057 --- Summary of changes: Help/manual/cmake-compile-features.7.rst | 7 ++- 1 file changed, 6 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, release, updated. v3.16.0-rc3-118-g1c09b8c164
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 1c09b8c164e0efd8fe82bb783d014e09e0285a0e (commit) via 667a88e260c4fccd0da23a96e3768d4e01dadc23 (commit) via 6cb9867ba3054ea4fbafa7ee60485db4d6266354 (commit) via 7d6ab5dc5bac806a268eac55deaf5bc550aaa6d4 (commit) via bb4c2781ced335c81b3c9307069792dba66d5062 (commit) via cc88ede7a37f8180f670c0d6036ba40cf005c7b9 (commit) via dae9a808fe0cb039298fab75459e3803403c5194 (commit) from fc4f00cbf64c6f192b36e7b9187fc26a1f51a4b4 (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/command/target_precompile_headers.rst | 122 - Help/prop_tgt/INTERFACE_PRECOMPILE_HEADERS.rst | 2 + Source/CPack/WiX/cmCPackWIXGenerator.cxx | 2 +- Source/CPack/cmCPackGenerator.cxx | 11 ++ Source/CPack/cmCPackNSISGenerator.cxx | 5 +- Source/CPack/cmCPackOSXX11Generator.cxx| 2 +- Source/CPack/cmCPackPKGGenerator.cxx | 4 +- Source/CPack/cmCPackSTGZGenerator.cxx | 3 +- Source/cmGeneratorTarget.cxx | 9 +- Source/cmTarget.cxx| 7 +- .../RunCMake/PrecompileHeaders/PchReuseFrom.cmake | 9 +- Tests/RunCMake/PrecompileHeaders/foobar.c | 8 +- 12 files changed, 115 insertions(+), 69 deletions(-) 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.16.0-rc3-476-g776d1e5e79
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 776d1e5e79ab5194a39ea53252703bf3cc13c118 (commit) via c80dfa0d5ba8817d73de5ee0a324d114b8336e05 (commit) via 0e46dea3430958183cb514c2a5518b5079ef588c (commit) via 1c09b8c164e0efd8fe82bb783d014e09e0285a0e (commit) via bd1655571738126eaf878960423a648cb34baf0b (commit) via e2cb9bcef22278564a15c696d3141fd2b3425a81 (commit) via 667a88e260c4fccd0da23a96e3768d4e01dadc23 (commit) via 498e3e67b3d4bd4e813d1fa1851c1d7aa115253d (commit) via 6cb9867ba3054ea4fbafa7ee60485db4d6266354 (commit) via b60563fee8cfa981f997d20df37d26938bf24883 (commit) via e14c9af013e8fe898a2cb46f4c1bd73dc72ff0a6 (commit) via 7d6ab5dc5bac806a268eac55deaf5bc550aaa6d4 (commit) via bb4c2781ced335c81b3c9307069792dba66d5062 (commit) via a4c19cb895f6275c5ff1a3991a117df1ad27cf15 (commit) via 0b9f1cc96b5babb10f14781648b02f9a28124cbc (commit) via 9e27e52d4b0fee729f9a3bef710efed290ef9900 (commit) via 26367b4bb2be9013d3bc30deef8ef1eda866a5cd (commit) via cc88ede7a37f8180f670c0d6036ba40cf005c7b9 (commit) via dae9a808fe0cb039298fab75459e3803403c5194 (commit) from f63d84c37c9ee1ea686369848b5bfc22916e1551 (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=776d1e5e79ab5194a39ea53252703bf3cc13c118 commit 776d1e5e79ab5194a39ea53252703bf3cc13c118 Merge: c80dfa0d5b a4c19cb895 Author: Brad King AuthorDate: Mon Nov 18 14:51:59 2019 + Commit: Kitware Robot CommitDate: Mon Nov 18 09:52:13 2019 -0500 Merge topic 'win-no-error-popup' a4c19cb895 Windows: Restore suppression of error report popups in CI builds 0b9f1cc96b Merge branch 'upstream-KWSys' into win-no-error-popup 9e27e52d4b KWSys 2019-11-15 (329d8c7c) Acked-by: Kitware Robot Merge-request: !4052 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c80dfa0d5ba8817d73de5ee0a324d114b8336e05 commit c80dfa0d5ba8817d73de5ee0a324d114b8336e05 Merge: 0e46dea343 1c09b8c164 Author: Brad King AuthorDate: Mon Nov 18 14:50:35 2019 + Commit: Kitware Robot CommitDate: Mon Nov 18 09:50:58 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e46dea3430958183cb514c2a5518b5079ef588c commit 0e46dea3430958183cb514c2a5518b5079ef588c Merge: bd16555717 7d6ab5dc5b Author: Brad King AuthorDate: Mon Nov 18 14:50:35 2019 + Commit: Kitware Robot CommitDate: Mon Nov 18 09:50:57 2019 -0500 Merge topic 'cpack-custom-templates' 7d6ab5dc5b CPack: Restore support for custom package configuration templates Acked-by: Kitware Robot Acked-by: Kyle Edwards Merge-request: !4054 diff --cc Source/CPack/cmCPackPKGGenerator.cxx index 328aac3826,dae5ec9d4b..ac3d64d9ae --- a/Source/CPack/cmCPackPKGGenerator.cxx +++ b/Source/CPack/cmCPackPKGGenerator.cxx @@@ -46,69 -46,10 +46,69 @@@ std::string cmCPackPKGGenerator::GetPac return component.ArchiveFile + ".pkg"; } -void cmCPackPKGGenerator::WriteDistributionFile(const char* metapackageFile) +void cmCPackPKGGenerator::CreateBackground(const char* themeName, + const char* metapackageFile, + cm::string_view genName, + cmXMLWriter& xout) +{ + std::string paramSuffix = +(themeName == nullptr) ? "" : cmSystemTools::UpperCase(themeName); + std::string opt = (themeName == nullptr) +? cmStrCat("CPACK_", genName, "_BACKGROUND") +: cmStrCat("CPACK_", genName, "_BACKGROUND_", paramSuffix); + const char* bgFileName = this->GetOption(opt); + if (bgFileName == nullptr) { +return; + } + + std::string bgFilePath = cmStrCat(metapackageFile, "/Contents/", bgFileName); + + if (!cmSystemTools::FileExists(bgFilePath)) { +cmCPackLogger(cmCPackLog::LOG_ERROR, + "Background image doesn't exist in the resource directory: " +<< bgFileName << std::endl); +return; + } + + if (themeName == nullptr) { +xout.StartElement("background"); + } else { +xout.StartElement(cmStrCat("background-", themeName)); + } + + xout.Attribute("file", bgFileName); + + const char* param = this->GetOption(cmStrCat(opt, "_ALIGNMENT")); + if (param != nullptr) { +xout.Attribute("alignment", param); + } + + param = this->GetOption(cmStrCat(opt, "_SCALING")); + if (param != nullptr) { +xout.Attribute("scaling", param); + } + + // Apple docs say
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-457-gf63d84c37c
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 f63d84c37c9ee1ea686369848b5bfc22916e1551 (commit) via 4ea992ab3241362d3b38aaa48319d13ef2cb87c5 (commit) via fc4f00cbf64c6f192b36e7b9187fc26a1f51a4b4 (commit) via 1bd06579a3435d82ce1146c431c582b72c18fec9 (commit) via 02aa03eb0a5e8551fb69b63712ef4512343cd769 (commit) via 88cfef0821933dfa4e840c793cdb9352d4b4423b (commit) from e56e9c14c5f06341c101e8de2a4876ecf3f5514f (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=f63d84c37c9ee1ea686369848b5bfc22916e1551 commit f63d84c37c9ee1ea686369848b5bfc22916e1551 Merge: 4ea992ab32 fc4f00cbf6 Author: Craig Scott AuthorDate: Mon Nov 18 10:49:52 2019 + Commit: Kitware Robot CommitDate: Mon Nov 18 05:50:02 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ea992ab3241362d3b38aaa48319d13ef2cb87c5 commit 4ea992ab3241362d3b38aaa48319d13ef2cb87c5 Merge: 1bd06579a3 02aa03eb0a Author: Craig Scott AuthorDate: Mon Nov 18 10:49:52 2019 + Commit: Kitware Robot CommitDate: Mon Nov 18 05:50:02 2019 -0500 Merge topic 'tutorial-replace-unicode-dash' 02aa03eb0a Tutorial: replace Unicode EN DASH with ASCII dash Acked-by: Kitware Robot Merge-request: !4058 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bd06579a3435d82ce1146c431c582b72c18fec9 commit 1bd06579a3435d82ce1146c431c582b72c18fec9 Merge: e56e9c14c5 88cfef0821 Author: Craig Scott AuthorDate: Mon Nov 18 10:46:16 2019 + Commit: Kitware Robot CommitDate: Mon Nov 18 05:46:31 2019 -0500 Merge topic 'ccmake_redirect_stdstreams' 88cfef0821 ccmake: redirect stdout/stderr to the displayed logs Acked-by: Kitware Robot Merge-request: !4005 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88cfef0821933dfa4e840c793cdb9352d4b4423b commit 88cfef0821933dfa4e840c793cdb9352d4b4423b Author: Sylvain Joubert AuthorDate: Tue Nov 5 17:07:42 2019 +0100 Commit: Sylvain Joubert CommitDate: Sat Nov 16 08:27:32 2019 +0100 ccmake: redirect stdout/stderr to the displayed logs Use cmSystemTools to report some messages. These should now be caught and displayed properly, both in ccmake and cmake-gui Avoid log display flickering during processing - Don't clear the screen each time the long message form is rendered. It always renders the whole screen again so clearing it only causes flickering. - Add scroll down capabilities to the long message form so that it can draw itself directly in the correct state. This removes the need to programatically scroll down just after that also caused flickering. Fixes #19882 Fixes #13288 diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx index 7732105085..01fce85454 100644 --- a/Source/CursesDialog/ccmake.cxx +++ b/Source/CursesDialog/ccmake.cxx @@ -155,10 +155,28 @@ int main(int argc, char const* const* argv) return 1; } + /* + * The message is stored in a list by the form which will be + * joined by '\n' before display. + * Removing any trailing '\n' avoid extra empty lines in the final results + */ + auto cleanMessage = [](const std::string& message) -> std::string { +auto msg = message; +if (!msg.empty() && msg.back() == '\n') { + msg.pop_back(); +} +return msg; + }; cmSystemTools::SetMessageCallback( -[myform](const std::string& message, const char* title) { - myform->AddError(message, title); +[&](const std::string& message, const char* title) { + myform->AddError(cleanMessage(message), title); }); + cmSystemTools::SetStderrCallback([&](const std::string& message) { +myform->AddError(cleanMessage(message), ""); + }); + cmSystemTools::SetStdoutCallback([&](const std::string& message) { +myform->UpdateProgress(cleanMessage(message), -1); + }); cmCursesForm::CurrentForm = myform; diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx index a69fdee894..806e663e9e 100644 --- a/Source/CursesDialog/cmCursesLongMessageForm.cxx +++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx @@ -17,7 +17,9 @@ inline int ctrl(int z) } cmCursesLongMessageForm::cmCursesLongMessageForm( - std::vector const& messages, const char* title) + std::vector const& messages, const char* title, + ScrollBehavior scrollBehavior) + : Scrolling(scrollBehavior) { // Append all messages into on big string this->Messages = cmJoin(messages, "\n"); @@
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-111-gfc4f00cbf6
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 fc4f00cbf64c6f192b36e7b9187fc26a1f51a4b4 (commit) via 02aa03eb0a5e8551fb69b63712ef4512343cd769 (commit) from f8a1b07953e6bf40da7def8459f8327cb007d2a9 (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/guide/tutorial/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits