[Cmake-commits] CMake branch, master, updated. v3.8.0-rc1-147-g74e83c5
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 74e83c5ff5238af2c4dbb0001160a6b90a008ed6 (commit) from dbdd25bc95af100633008a31f1bbdf7146e211f7 (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=74e83c5ff5238af2c4dbb0001160a6b90a008ed6 commit 74e83c5ff5238af2c4dbb0001160a6b90a008ed6 Author: Kitware Robot AuthorDate: Sat Feb 18 00:01:03 2017 -0500 Commit: Kitware Robot CommitDate: Sat Feb 18 00:01:03 2017 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 24d45c5..8420ee9 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 8) -set(CMake_VERSION_PATCH 20170217) +set(CMake_VERSION_PATCH 20170218) #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.8.0-rc1-254-ge939f8b
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 e939f8b18003e9b3fd2e2f398d3a2a0f8e5a46ad (commit) via 89541d043d1d53b1a6c1082a9e9574b16165562d (commit) via a3ff237a5c221be52bbd2cf7b526fd19b5202a35 (commit) from b7af957834c120064057a0180487a56fc12ec7e1 (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=e939f8b18003e9b3fd2e2f398d3a2a0f8e5a46ad commit e939f8b18003e9b3fd2e2f398d3a2a0f8e5a46ad Merge: b7af957 89541d0 Author: Daniel Pfeifer AuthorDate: Fri Feb 17 16:51:06 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 16:51:06 2017 -0500 Merge topic 'iwyu' into next 89541d04 fixup! cmFortranParser: include what you use a3ff237a ParserHelper: Move macros to bottom of files https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89541d043d1d53b1a6c1082a9e9574b16165562d commit 89541d043d1d53b1a6c1082a9e9574b16165562d Author: Daniel Pfeifer AuthorDate: Fri Feb 17 22:49:24 2017 +0100 Commit: Daniel Pfeifer CommitDate: Fri Feb 17 22:49:24 2017 +0100 fixup! cmFortranParser: include what you use diff --git a/Source/cmFortranParser.cxx b/Source/cmFortranParser.cxx index 45d9639..c67227f 100644 --- a/Source/cmFortranParser.cxx +++ b/Source/cmFortranParser.cxx @@ -97,7 +97,7 @@ Modify cmFortranParser.cxx: - "#if 0" out yyerrorlab block in range ["goto yyerrlab1", "yyerrlab1:"] */ -#include +#include // IWYU pragma: keep #include #include diff --git a/Source/cmFortranParser.y b/Source/cmFortranParser.y index be4959c..3d68134 100644 --- a/Source/cmFortranParser.y +++ b/Source/cmFortranParser.y @@ -26,7 +26,7 @@ Modify cmFortranParser.cxx: - "#if 0" out yyerrorlab block in range ["goto yyerrlab1", "yyerrlab1:"] */ -#include +#include // IWYU pragma: keep #include #include diff --git a/Source/cmFortranParserTokens.h b/Source/cmFortranParserTokens.h index 18b9e0a..8d6a5fe 100644 --- a/Source/cmFortranParserTokens.h +++ b/Source/cmFortranParserTokens.h @@ -130,7 +130,7 @@ extern int cmFortran_yydebug; union YYSTYPE { -#line 75 "cmFortranParser.y" /* yacc.c:1909 */ +#line 70 "cmFortranParser.y" /* yacc.c:1909 */ char* string; https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3ff237a5c221be52bbd2cf7b526fd19b5202a35 commit a3ff237a5c221be52bbd2cf7b526fd19b5202a35 Author: Daniel Pfeifer AuthorDate: Fri Feb 17 22:43:43 2017 +0100 Commit: Daniel Pfeifer CommitDate: Fri Feb 17 22:43:43 2017 +0100 ParserHelper: Move macros to bottom of files Since the class name is used in the macros, the iwyu tool gets confused wheter it needs a forward declaration or not. While editing the files, make sure structs have no typedef. Also, remove confusing comments about Java. diff --git a/Source/cmCommandArgumentParserHelper.h b/Source/cmCommandArgumentParserHelper.h index 95bf0ad..5bfb236 100644 --- a/Source/cmCommandArgumentParserHelper.h +++ b/Source/cmCommandArgumentParserHelper.h @@ -8,27 +8,15 @@ #include #include -#define YYSTYPE cmCommandArgumentParserHelper::ParserType -#define YYSTYPE_IS_DECLARED -#define YY_EXTRA_TYPE cmCommandArgumentParserHelper* -#define YY_DECL \ - int cmCommandArgument_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner) - -/** \class cmCommandArgumentParserHelper - * \brief Helper class for parsing java source files - * - * Finds dependencies for java file and list of outputs - */ - class cmMakefile; class cmCommandArgumentParserHelper { public: - typedef struct + struct ParserType { char* str; - } ParserType; + }; cmCommandArgumentParserHelper(); ~cmCommandArgumentParserHelper(); @@ -100,4 +88,10 @@ private: bool RemoveEmpty; }; +#define YYSTYPE cmCommandArgumentParserHelper::ParserType +#define YYSTYPE_IS_DECLARED +#define YY_EXTRA_TYPE cmCommandArgumentParserHelper* +#define YY_DECL \ + int cmCommandArgument_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner) + #endif diff --git a/Source/cmDependsJavaParserHelper.h b/Source/cmDependsJavaParserHelper.h index 71b939c..5f28f70 100644 --- a/Source/cmDependsJavaParserHelper.h +++ b/Source/cmDependsJavaParserHelper.h @@ -8,26 +8,18 @@ #include #include -class cmDependsJavaParserHelper; - -#define YYSTYPE cmDependsJavaParserHelper::ParserType -#define YYSTYPE_IS_DECLARED -#define YY_EXTRA_TYPE cmDependsJavaParserHelper* -#define YY_DECL int cmDependsJava_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner) - /** \class cmDependsJavaParserHelper * \brief Helper class fo
[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-244-g0b303f9
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 0b303f9d018b06a0d46937d6ddc3001484e1c1b8 (commit) via 3287ba02540ae94d6b0105f84e930aa19cf61b19 (commit) from 38c92f8d1c4e372aaeb598f54822dc71281a580a (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=0b303f9d018b06a0d46937d6ddc3001484e1c1b8 commit 0b303f9d018b06a0d46937d6ddc3001484e1c1b8 Merge: 38c92f8 3287ba0 Author: Brad King AuthorDate: Fri Feb 17 14:33:51 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 14:33:51 2017 -0500 Merge topic 'fix-CMAKE_ROOT-case' into next 3287ba02 Make CMAKE_ROOT independent of case of path used to invoke cmake https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3287ba02540ae94d6b0105f84e930aa19cf61b19 commit 3287ba02540ae94d6b0105f84e930aa19cf61b19 Author: Brad King AuthorDate: Fri Feb 17 10:59:47 2017 -0500 Commit: Brad King CommitDate: Fri Feb 17 11:09:12 2017 -0500 Make CMAKE_ROOT independent of case of path used to invoke cmake We compute the location of `CMAKE_ROOT` and other resources relative to the location of our own executable. On some platforms this path is computed in a way that depends on the case of the path used to invoke the executable. Convert the result to the actual case preserved by the filesystem on disk in order to make it consistent regardless of how the executable is launched. This approach generalizes the fix made by commit v3.8.0-rc1~71^2 (cmSystemTools: use the actual case for root detection, 2017-01-18). Issue: #16648 diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 9efc13b..b3a7248 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1978,6 +1978,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0) // ??? } #endif + exe_dir = cmSystemTools::GetActualCaseForPath(exe_dir); cmSystemToolsCMakeCommand = exe_dir; cmSystemToolsCMakeCommand += "/cmake"; cmSystemToolsCMakeCommand += cmSystemTools::GetExecutableExtension(); @@ -2015,8 +2016,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0) // Install tree has // - "/cmake" // - "" - const std::string actual_case = cmSystemTools::GetActualCaseForPath(exe_dir); - if (cmHasSuffix(actual_case, CMAKE_BIN_DIR)) { + if (cmHasSuffix(exe_dir, CMAKE_BIN_DIR)) { std::string const prefix = exe_dir.substr(0, exe_dir.size() - strlen(CMAKE_BIN_DIR)); cmSystemToolsCMakeRoot = prefix + CMAKE_DATA_DIR; --- Summary of changes: Source/cmSystemTools.cxx |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.8.0-rc1-242-g38c92f8
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 38c92f8d1c4e372aaeb598f54822dc71281a580a (commit) via e2d78f7535951adc505014d3afde59b52caf35f1 (commit) from 0f8ea1fdfa8e8ad51633d17dd0ffc158f619a8fb (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=38c92f8d1c4e372aaeb598f54822dc71281a580a commit 38c92f8d1c4e372aaeb598f54822dc71281a580a Merge: 0f8ea1f e2d78f7 Author: Brad King AuthorDate: Fri Feb 17 14:33:45 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 14:33:45 2017 -0500 Merge topic 'fix-CMP0017-path-case' into next e2d78f75 Windows: Fix inconsistent behavior on changes to case of path to cmake https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2d78f7535951adc505014d3afde59b52caf35f1 commit e2d78f7535951adc505014d3afde59b52caf35f1 Author: Brad King AuthorDate: Fri Feb 17 10:15:21 2017 -0500 Commit: Brad King CommitDate: Fri Feb 17 11:10:45 2017 -0500 Windows: Fix inconsistent behavior on changes to case of path to cmake In commit v3.4.0-rc1~333^2 (Merge branch 'upstream-kwsys' into update-kwsys, 2015-07-15) we brought in upstream KWSys commit 86a24794 (SystemTools: Fix GetActualCaseForPath drive letter case handling, 2015-07-09). This caused our path processing to convert drive letters to upper-case and exposed an existing bug in our implementation of CMP0017. Policy CMP0017 is responsible for ensuring that modules included from a builtin module only load other builtin modules and cannot be overridden by a file in `CMAKE_MODULE_PATH`. If there is a case difference in the drive letter (or other path components) then the path to the including module may not match our builtin module directory in a simple string comparison. This means builtin modules may not be recognized as such, and they may not reliably include their builtin dependencies. For example, if a project provides a `Platform/Windows` module in `CMAKE_MODULE_PATH` it can break inclusion of our builtin `Platform/Windows` module, leading to strange behavior. Fix this by comparing the path to the including module to our builtin module directory using a function that is aware of case-insensitivity of paths on Windows. Fixes: #16648, #16622 diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index bfe46ae..1e995fb 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3362,7 +3362,7 @@ std::string cmMakefile::GetModulesFile(const char* filename) const if (!moduleInCMakeModulePath.empty() && !moduleInCMakeRoot.empty()) { const char* currentFile = this->GetDefinition("CMAKE_CURRENT_LIST_FILE"); std::string mods = cmSystemTools::GetCMakeRoot() + "/Modules/"; -if (currentFile && strncmp(currentFile, mods.c_str(), mods.size()) == 0) { +if (currentFile && cmSystemTools::IsSubDirectory(currentFile, mods)) { switch (this->GetPolicyStatus(cmPolicies::CMP0017)) { case cmPolicies::WARN: { std::ostringstream e; --- Summary of changes: Source/cmMakefile.cxx |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.8.0-rc1-240-g0f8ea1f
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 0f8ea1fdfa8e8ad51633d17dd0ffc158f619a8fb (commit) via 734581f49fc0eac4c49e941c0cc450a04c866896 (commit) from 8cf6ac2226d23ac78cea34ddfae28e1626d289e1 (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=0f8ea1fdfa8e8ad51633d17dd0ffc158f619a8fb commit 0f8ea1fdfa8e8ad51633d17dd0ffc158f619a8fb Merge: 8cf6ac2 734581f Author: Brad King AuthorDate: Fri Feb 17 11:47:41 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 11:47:41 2017 -0500 Merge topic 'productbuild_resources' into next 734581f4 CPack: Add support for CPACK_PRODUCTBULID_RESOURCES_DIR https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=734581f49fc0eac4c49e941c0cc450a04c866896 commit 734581f49fc0eac4c49e941c0cc450a04c866896 Author: Tim Hutt AuthorDate: Tue Feb 14 10:09:23 2017 + Commit: Brad King CommitDate: Fri Feb 17 11:47:00 2017 -0500 CPack: Add support for CPACK_PRODUCTBULID_RESOURCES_DIR This allows you to copy custom files (e.g. a background image) into the macOS installer. Fixes: #16604 diff --git a/Help/release/dev/productbuild_resources.rst b/Help/release/dev/productbuild_resources.rst new file mode 100644 index 000..f381e63 --- /dev/null +++ b/Help/release/dev/productbuild_resources.rst @@ -0,0 +1,7 @@ +productbuild_resources +-- + +* The :module:`CPackProductBuild` module gained a new + :variable:`CPACK_PRODUCTBUILD_RESOURCES_DIR` variable to + specify resources to be copied into the ``Resources`` + directory. diff --git a/Modules/CPackProductBuild.cmake b/Modules/CPackProductBuild.cmake index d545d3e..4779b95 100644 --- a/Modules/CPackProductBuild.cmake +++ b/Modules/CPackProductBuild.cmake @@ -46,3 +46,11 @@ # # Specify a specific keychain to search for the signing identity. # +# +# .. variable:: CPACK_PRODUCTBUILD_RESOURCES_DIR +# +# If specified the productbuild generator copies files from this directory +# (including subdirectories) to the ``Resources`` directory. This is done +# before the :variable:`CPACK_RESOURCE_FILE_WELCOME`, +# :variable:`CPACK_RESOURCE_FILE_README`, and +# :variable:`CPACK_RESOURCE_FILE_LICENSE` files are copied. diff --git a/Source/CPack/cmCPackProductBuildGenerator.cxx b/Source/CPack/cmCPackProductBuildGenerator.cxx index a5a18dc..0e93234 100644 --- a/Source/CPack/cmCPackProductBuildGenerator.cxx +++ b/Source/CPack/cmCPackProductBuildGenerator.cxx @@ -59,12 +59,25 @@ int cmCPackProductBuildGenerator::PackageFiles() } } - // Copy or create all of the resource files we need. std::string resDir = packageDirFileName + "/Contents"; + + if (this->IsSet("CPACK_PRODUCTBUILD_RESOURCES_DIR")) { +std::string userResDir = + this->GetOption("CPACK_PRODUCTBUILD_RESOURCES_DIR"); + +if (!cmSystemTools::CopyADirectory(userResDir, resDir)) { + cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem copying the resource files" + << std::endl); + return 0; +} + } + + // Copy or create all of the resource files we need. if (!this->CopyCreateResourceFile("License", resDir) || !this->CopyCreateResourceFile("ReadMe", resDir) || !this->CopyCreateResourceFile("Welcome", resDir)) { -cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem copying the resource files" +cmCPackLogger(cmCPackLog::LOG_ERROR, + "Problem copying the License, ReadMe and Welcome files" << std::endl); return 0; } --- Summary of changes: Help/release/dev/productbuild_resources.rst |7 +++ Modules/CPackProductBuild.cmake |8 Source/CPack/cmCPackProductBuildGenerator.cxx | 17 +++-- 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 Help/release/dev/productbuild_resources.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.8.0-rc1-238-g8cf6ac2
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 8cf6ac2226d23ac78cea34ddfae28e1626d289e1 (commit) via d32f9debc80e1fc90efb07392f829d998cbbc2c5 (commit) from 477b3d2aee0dbd793710556ef798e8189cf7bcd5 (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=8cf6ac2226d23ac78cea34ddfae28e1626d289e1 commit 8cf6ac2226d23ac78cea34ddfae28e1626d289e1 Merge: 477b3d2 d32f9de Author: Brad King AuthorDate: Fri Feb 17 11:42:15 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 11:42:15 2017 -0500 Merge topic 'productbuild_component_plist' into next d32f9deb CPack: Add option to specify --component-plist for productbuild https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d32f9debc80e1fc90efb07392f829d998cbbc2c5 commit d32f9debc80e1fc90efb07392f829d998cbbc2c5 Author: Tim Hutt AuthorDate: Tue Feb 14 13:18:42 2017 + Commit: Brad King CommitDate: Fri Feb 17 11:40:45 2017 -0500 CPack: Add option to specify --component-plist for productbuild When using the productbuild generator this lets you specify the value of the `--component-plist` parameter when it runs pkgbuild for a component. Fixes: #16638 diff --git a/Help/release/dev/productbuild_component_plist.rst b/Help/release/dev/productbuild_component_plist.rst new file mode 100644 index 000..78d305c --- /dev/null +++ b/Help/release/dev/productbuild_component_plist.rst @@ -0,0 +1,7 @@ +productbuild_component_plist + + +* The :module:`CPackComponent` module :command:`cpack_add_component` command + gained a new ``PLIST `` option to specify the ``pkgbuild`` + ``--component-plist`` argument when using the + :module:`productbuild ` generator. diff --git a/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake index 188dde3..395a268 100644 --- a/Modules/CPackComponent.cmake +++ b/Modules/CPackComponent.cmake @@ -105,7 +105,8 @@ # [DEPENDS comp1 comp2 ... ] # [INSTALL_TYPES type1 type2 ... ] # [DOWNLOADED] -# [ARCHIVE_FILE filename]) +# [ARCHIVE_FILE filename] +# [PLIST filename]) # # # @@ -163,6 +164,9 @@ # a file with some name based on CPACK_PACKAGE_FILE_NAME and the name of # the component. See cpack_configure_downloads for more information. # +# PLIST gives a filename that is passed to pkgbuild with the +# ``--component-plist`` argument when using the productbuild generator. +# # .. command:: cpack_add_component_group # # Describes a group of related CPack installation components. @@ -389,7 +393,7 @@ endmacro() macro(cpack_add_component compname) string(TOUPPER ${compname} _CPACK_ADDCOMP_UNAME) cpack_parse_arguments(CPACK_COMPONENT_${_CPACK_ADDCOMP_UNAME} -"DISPLAY_NAME;DESCRIPTION;GROUP;DEPENDS;INSTALL_TYPES;ARCHIVE_FILE" +"DISPLAY_NAME;DESCRIPTION;GROUP;DEPENDS;INSTALL_TYPES;ARCHIVE_FILE;PLIST" "HIDDEN;REQUIRED;DISABLED;DOWNLOADED" ${ARGN} ) @@ -445,6 +449,9 @@ macro(cpack_add_component compname) cpack_append_option_set_command( CPACK_COMPONENT_${_CPACK_ADDCOMP_UNAME}_DOWNLOADED _CPACK_ADDCOMP_STR) + cpack_append_string_variable_set_command( +CPACK_COMPONENT_${_CPACK_ADDCOMP_UNAME}_PLIST +_CPACK_ADDCOMP_STR) # Backward compatibility issue. # Write to config iff the macros is used after CPack.cmake has been # included, other it's not necessary because the variables diff --git a/Source/CPack/cmCPackComponentGroup.h b/Source/CPack/cmCPackComponentGroup.h index f955daf..510adc2 100644 --- a/Source/CPack/cmCPackComponentGroup.h +++ b/Source/CPack/cmCPackComponentGroup.h @@ -78,6 +78,10 @@ public: /// contains the files that are part of this component. std::string ArchiveFile; + /// The file to pass to --component-plist when using the + /// productbuild generator. + std::string Plist; + /// The components that this component depends on. std::vector Dependencies; diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 21eda79..e1a4a2a 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -1396,6 +1396,11 @@ cmCPackComponent* cmCPackGenerator::GetComponent( component->ArchiveFile = archiveFile; } +const char* plist = this->GetOption(macroPrefix + "_PLIST"); +if (plist && *plist) { + component->Plist = plist; +} + const char* groupName = this->GetOption(macroPrefix + "_GROUP"); if (groupName && *groupName) { component->Group =
[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-234-g829748c
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 829748c7d25f49059e79031fc747ccf75fe11242 (commit) via 96d6139386e22f672f14071eae3911fd7200f079 (commit) from 2ba45d5adf671b82ed11aa994b920e988d0500a9 (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=829748c7d25f49059e79031fc747ccf75fe11242 commit 829748c7d25f49059e79031fc747ccf75fe11242 Merge: 2ba45d5 96d6139 Author: Brad King AuthorDate: Fri Feb 17 09:32:53 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 09:32:53 2017 -0500 Merge topic 'FindHDF5-fix-header-langs' into next 96d61393 FindHDF5: Fix search for language-specific header file https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96d6139386e22f672f14071eae3911fd7200f079 commit 96d6139386e22f672f14071eae3911fd7200f079 Author: Brad King AuthorDate: Fri Feb 17 09:21:02 2017 -0500 Commit: Brad King CommitDate: Fri Feb 17 09:25:46 2017 -0500 FindHDF5: Fix search for language-specific header file Refactoring in commit v3.6.0-rc1~85^2 (HDF5: Refactor the use of compiler wrappers, 2016-04-04) converted code of the form if(${LANGUAGE} MATCHES ...) to if(LANGUAGE MATCHES ...) However, `LANGUAGE` is a foreach() loop variable and not a normal variable so auto-dereference does not occur. Restore the explicit `${}` syntax and use the new name of the loop variable that has changed since then too. Fixes: #16651 diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index fb97d68..65a825d 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -666,9 +666,9 @@ if( NOT HDF5_FOUND ) foreach(__lang IN LISTS HDF5_LANGUAGE_BINDINGS) # find the HDF5 include directories -if(LANGUAGE STREQUAL "Fortran") +if("${__lang}" STREQUAL "Fortran") set(HDF5_INCLUDE_FILENAME hdf5.mod) -elseif(LANGUAGE STREQUAL "CXX") +elseif("${__lang}" STREQUAL "CXX") set(HDF5_INCLUDE_FILENAME H5Cpp.h) else() set(HDF5_INCLUDE_FILENAME hdf5.h) --- Summary of changes: Modules/FindHDF5.cmake |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.8.0-rc1-236-g477b3d2
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 477b3d2aee0dbd793710556ef798e8189cf7bcd5 (commit) via dbdd25bc95af100633008a31f1bbdf7146e211f7 (commit) from 829748c7d25f49059e79031fc747ccf75fe11242 (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=477b3d2aee0dbd793710556ef798e8189cf7bcd5 commit 477b3d2aee0dbd793710556ef798e8189cf7bcd5 Merge: 829748c dbdd25b Author: Brad King AuthorDate: Fri Feb 17 09:33:09 2017 -0500 Commit: Brad King CommitDate: Fri Feb 17 09:33:09 2017 -0500 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.8.0-rc1-146-gdbdd25b
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 dbdd25bc95af100633008a31f1bbdf7146e211f7 (commit) via 96d6139386e22f672f14071eae3911fd7200f079 (commit) from c58b0926a7941096e77a7d75760f68523cb01107 (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=dbdd25bc95af100633008a31f1bbdf7146e211f7 commit dbdd25bc95af100633008a31f1bbdf7146e211f7 Merge: c58b092 96d6139 Author: Brad King AuthorDate: Fri Feb 17 09:32:57 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 09:32:57 2017 -0500 Merge topic 'FindHDF5-fix-header-langs' 96d61393 FindHDF5: Fix search for language-specific header file --- Summary of changes: Modules/FindHDF5.cmake |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.8.0-rc1-232-g2ba45d5
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 2ba45d5adf671b82ed11aa994b920e988d0500a9 (commit) via c58b0926a7941096e77a7d75760f68523cb01107 (commit) from 75b076980b1522345e07bc3db45a13874896bae2 (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=2ba45d5adf671b82ed11aa994b920e988d0500a9 commit 2ba45d5adf671b82ed11aa994b920e988d0500a9 Merge: 75b0769 c58b092 Author: Brad King AuthorDate: Fri Feb 17 09:19:22 2017 -0500 Commit: Brad King CommitDate: Fri Feb 17 09:19:22 2017 -0500 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.8.0-rc1-144-gc58b092
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 c58b0926a7941096e77a7d75760f68523cb01107 (commit) via 28bb68e3472a9f8c6d8eec894e85de74b976ff02 (commit) from f3e8a89a9b9a859b0e55abe474f85858a3cb2f40 (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=c58b0926a7941096e77a7d75760f68523cb01107 commit c58b0926a7941096e77a7d75760f68523cb01107 Merge: f3e8a89 28bb68e Author: Brad King AuthorDate: Fri Feb 17 09:18:44 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 09:18:44 2017 -0500 Merge topic 'FindHDF5-include-dir-advanced' 28bb68e3 FindHDF5: Restore HDF5__INCLUDE_DIR advanced cache entry mark --- Summary of changes: Modules/FindHDF5.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.8.0-rc1-230-g75b0769
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 75b076980b1522345e07bc3db45a13874896bae2 (commit) via 28bb68e3472a9f8c6d8eec894e85de74b976ff02 (commit) from f80f94e6538a62d6de430c12630e15ecfd902830 (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=75b076980b1522345e07bc3db45a13874896bae2 commit 75b076980b1522345e07bc3db45a13874896bae2 Merge: f80f94e 28bb68e Author: Brad King AuthorDate: Fri Feb 17 09:17:53 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 09:17:53 2017 -0500 Merge topic 'FindHDF5-include-dir-advanced' into next 28bb68e3 FindHDF5: Restore HDF5__INCLUDE_DIR advanced cache entry mark https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28bb68e3472a9f8c6d8eec894e85de74b976ff02 commit 28bb68e3472a9f8c6d8eec894e85de74b976ff02 Author: Brad King AuthorDate: Fri Feb 17 09:07:18 2017 -0500 Commit: Brad King CommitDate: Fri Feb 17 09:10:03 2017 -0500 FindHDF5: Restore HDF5__INCLUDE_DIR advanced cache entry mark Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching to correctly find HL for all bindings, 2016-05-12) renamed the language loop variable used to construct the name of `HDF5__INCLUDE_DIR` but forgot to update it in the `mark_as_advanced` call. Fix it now. Issue: #16651 diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index e1199a7..fb97d68 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -680,7 +680,7 @@ if( NOT HDF5_FOUND ) PATH_SUFFIXES include Include ${_HDF5_SEARCH_OPTS} ) -mark_as_advanced(HDF5_${LANGUAGE}_INCLUDE_DIR) +mark_as_advanced(HDF5_${__lang}_INCLUDE_DIR) list(APPEND HDF5_INCLUDE_DIRS ${HDF5_${__lang}_INCLUDE_DIR}) # find the HDF5 libraries --- Summary of changes: Modules/FindHDF5.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.8.0-rc1-228-gf80f94e
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 f80f94e6538a62d6de430c12630e15ecfd902830 (commit) via f3e8a89a9b9a859b0e55abe474f85858a3cb2f40 (commit) via 988c63527ded3cfcb0469532a00c12abe7bc8d0c (commit) via 5febec7a4b3069f3661887ecc0e6b24d7d169fcf (commit) via 261b5785adbadd994c5f8869766f5c1017cbf721 (commit) via b6c9a851cba4f28bf0614b145803dc46096b6cde (commit) from e889750e7bce9750ef1f8cc505e77ead0b5aad1d (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=f80f94e6538a62d6de430c12630e15ecfd902830 commit f80f94e6538a62d6de430c12630e15ecfd902830 Merge: e889750 f3e8a89 Author: Brad King AuthorDate: Fri Feb 17 08:47:17 2017 -0500 Commit: Brad King CommitDate: Fri Feb 17 08:47:17 2017 -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.8.0-rc1-142-gf3e8a89
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 f3e8a89a9b9a859b0e55abe474f85858a3cb2f40 (commit) via 1ba91291e3237e5535a46c6ff1bce6a33d298a76 (commit) via f7b9bf41c5386dfc38b7a722f75b0e23a02d542b (commit) via 4bff2d14fd3010ba4aa1bfc3eda2fb2cdcc5da0f (commit) via 624fb9d7175ee011f8a86c8d7614be4806a53184 (commit) from 988c63527ded3cfcb0469532a00c12abe7bc8d0c (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=f3e8a89a9b9a859b0e55abe474f85858a3cb2f40 commit f3e8a89a9b9a859b0e55abe474f85858a3cb2f40 Merge: 988c635 1ba9129 Author: Brad King AuthorDate: Fri Feb 17 08:46:14 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 08:46:14 2017 -0500 Merge topic 'install_name_policy' 1ba91291 Add policy CMP0068 separate install_name and RPATH settings on macOS f7b9bf41 Apple: Add BUILD_WITH_INSTALL_NAME_DIR target property 4bff2d14 Apple: Refactor support for using INSTALL_NAME_DIR. 624fb9d7 Help: Format BUILD_WITH_INSTALL_RPATH documentation --- Summary of changes: Help/manual/cmake-policies.7.rst |8 ++ Help/manual/cmake-properties.7.rst |1 + Help/manual/cmake-variables.7.rst |1 + Help/policy/CMP0068.rst| 35 Help/prop_tgt/BUILD_WITH_INSTALL_NAME_DIR.rst | 13 +++ Help/prop_tgt/BUILD_WITH_INSTALL_RPATH.rst | 18 ++-- Help/release/dev/install_name_policy.rst | 11 +++ .../variable/CMAKE_BUILD_WITH_INSTALL_NAME_DIR.rst |7 ++ Source/cmGeneratorTarget.cxx | 86 +++- Source/cmGeneratorTarget.h | 10 +++ Source/cmGlobalGenerator.cxx | 25 ++ Source/cmGlobalGenerator.h |3 + Source/cmPolicies.h|8 +- Source/cmTarget.cxx|1 + .../CMP0068-NEW-result.txt}|0 Tests/RunCMake/CMP0068/CMP0068-NEW.cmake |6 ++ .../CMP0068-OLD-result.txt}|0 Tests/RunCMake/CMP0068/CMP0068-OLD.cmake |6 ++ .../CMP0068-WARN-result.txt} |0 Tests/RunCMake/CMP0068/CMP0068-WARN-stderr.txt | 12 +++ .../CMP0068-WARN.cmake}|3 + Tests/RunCMake/{CMP0051 => CMP0068}/CMakeLists.txt |2 +- Tests/RunCMake/CMP0068/RunCMakeTest.cmake |5 ++ .../Export => RunCMake/CMP0068}/empty.cpp |0 Tests/RunCMake/CMakeLists.txt |3 + .../RunCMake/TargetPolicies/PolicyList-stderr.txt |1 + Tests/RunCMake/install/EXPORT-OldIFace.cmake |1 + 27 files changed, 236 insertions(+), 30 deletions(-) create mode 100644 Help/policy/CMP0068.rst create mode 100644 Help/prop_tgt/BUILD_WITH_INSTALL_NAME_DIR.rst create mode 100644 Help/release/dev/install_name_policy.rst create mode 100644 Help/variable/CMAKE_BUILD_WITH_INSTALL_NAME_DIR.rst copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0068/CMP0068-NEW-result.txt} (100%) create mode 100644 Tests/RunCMake/CMP0068/CMP0068-NEW.cmake copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0068/CMP0068-OLD-result.txt} (100%) create mode 100644 Tests/RunCMake/CMP0068/CMP0068-OLD.cmake copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0068/CMP0068-WARN-result.txt} (100%) create mode 100644 Tests/RunCMake/CMP0068/CMP0068-WARN-stderr.txt copy Tests/RunCMake/{CMP0042/CMP0042-WARN.cmake => CMP0068/CMP0068-WARN.cmake} (69%) copy Tests/RunCMake/{CMP0051 => CMP0068}/CMakeLists.txt (63%) create mode 100644 Tests/RunCMake/CMP0068/RunCMakeTest.cmake copy Tests/{ExportImport/Export => RunCMake/CMP0068}/empty.cpp (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, master, updated. v3.8.0-rc1-133-g5febec7
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 5febec7a4b3069f3661887ecc0e6b24d7d169fcf (commit) via 9b78dca3a909ce3161d235718f935bf2fb9b7f64 (commit) from 261b5785adbadd994c5f8869766f5c1017cbf721 (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=5febec7a4b3069f3661887ecc0e6b24d7d169fcf commit 5febec7a4b3069f3661887ecc0e6b24d7d169fcf Merge: 261b578 9b78dca Author: Brad King AuthorDate: Fri Feb 17 08:46:03 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 08:46:03 2017 -0500 Merge topic 'FindOpenSSL-crypto-name' 9b78dca3 FindOpenSSL: Add another name for libcrypto with MSVC --- Summary of changes: Modules/FindOpenSSL.cmake |1 + 1 file changed, 1 insertion(+) 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.8.0-rc1-137-g988c635
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 988c63527ded3cfcb0469532a00c12abe7bc8d0c (commit) via 761ea20518081de976a40e590577056f23188fbd (commit) via 1728b9c076a34ef017f10499e5b637d025b2afd8 (commit) via fe75e140d617dd2d8401a85c718d03a6466a8bd9 (commit) from 5febec7a4b3069f3661887ecc0e6b24d7d169fcf (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=988c63527ded3cfcb0469532a00c12abe7bc8d0c commit 988c63527ded3cfcb0469532a00c12abe7bc8d0c Merge: 5febec7 761ea20 Author: Brad King AuthorDate: Fri Feb 17 08:46:11 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 08:46:11 2017 -0500 Merge topic 'bison3' 761ea205 cmCommandArgumentParser: reformat grammar 1728b9c0 cmDependsJavaParser: Port to bison 3 fe75e140 cmCommandArgumentParser: Port to bison 3 --- Summary of changes: Source/cmCommandArgumentParser.cxx | 1328 +-- Source/cmCommandArgumentParser.y | 205 +- Source/cmCommandArgumentParserTokens.h | 73 +- Source/cmDependsJavaParser.cxx | 3959 ++-- Source/cmDependsJavaParser.y | 25 +- Source/cmDependsJavaParserTokens.h | 272 +-- 6 files changed, 3073 insertions(+), 2789 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.8.0-rc1-131-g261b578
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 261b5785adbadd994c5f8869766f5c1017cbf721 (commit) via f10b2f72f6979ccb16410d97bac98c440eb7f992 (commit) via ef399f9bc6b8e2ff917a5f2809346fb81fd954ae (commit) from b6c9a851cba4f28bf0614b145803dc46096b6cde (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=261b5785adbadd994c5f8869766f5c1017cbf721 commit 261b5785adbadd994c5f8869766f5c1017cbf721 Merge: b6c9a85 f10b2f7 Author: Brad King AuthorDate: Fri Feb 17 08:45:36 2017 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 17 08:45:36 2017 -0500 Merge topic 'capture-ctest_update-svn-failures' f10b2f72 ctest_update: Capture failure of svn to load revisions and local mods ef399f9b ctest_update: Refactor internal APIs to support more failure cases --- Summary of changes: Source/CTest/cmCTestBZR.cxx | 14 +- Source/CTest/cmCTestBZR.h |8 Source/CTest/cmCTestGIT.cxx | 12 Source/CTest/cmCTestGIT.h |8 Source/CTest/cmCTestGlobalVC.cxx |7 --- Source/CTest/cmCTestGlobalVC.h|4 ++-- Source/CTest/cmCTestHG.cxx| 12 Source/CTest/cmCTestHG.h |8 Source/CTest/cmCTestP4.cxx| 16 ++-- Source/CTest/cmCTestP4.h |8 Source/CTest/cmCTestSVN.cxx | 33 + Source/CTest/cmCTestSVN.h | 12 ++-- Source/CTest/cmCTestUpdateHandler.cxx |4 ++-- Source/CTest/cmCTestVC.cxx| 12 +++- Source/CTest/cmCTestVC.h |4 ++-- 15 files changed, 95 insertions(+), 67 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits