Commit Graph

32278 Commits

Author SHA1 Message Date
Ben Boeckel cc4e19710d cmGlobalNinjaGenerator: use an extention based on the modmapfmt 2022-04-27 14:30:41 -04:00
Ben Boeckel 97a68198c9 cmGlobalNinjaGenerator: escape : in module names
Not all filesystems support `:` in the name, so replace it with `-`. As
`-` is not otherwise allowed in module names anyways, there is no risk
of conflict.
2022-04-27 14:30:41 -04:00
Ben Boeckel 499009b79c cmTarget: avoid creating export entries if they don't exist 2022-04-27 14:30:41 -04:00
Ben Boeckel 0513a1fe10 cmInstallGenerator: use CMake-private variables in generated code 2022-04-27 14:30:41 -04:00
Ben Boeckel 44a110eb80 cmInstallGenerator: fix default argument comments 2022-04-27 08:56:46 -04:00
Ben Boeckel 5f93cf4afe cmFileSet: support makefile-less error reporting of visibility 2022-04-27 08:56:46 -04:00
Brad King 5cfb2cead6 Merge topic 'file-set-simplifications'
9916d4dd44 cmTarget: factor out fileset type handling
79d6b928a3 RunCMake/target_sources: test `HEADERS` file sets via generic props
d74f9599f6 cmTarget: require filesets to be of the right type
5da4fe30a9 cmTarget: factor out fileset property manipulation
c89580487b cmTarget: pass candidate strings by const-ref
64ea1a272c messages: remove screamake from comments and errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7145
2022-04-27 08:48:47 -04:00
Kitware Robot b30228c7c1 CMake Nightly Date Stamp 2022-04-27 00:01:26 -04:00
Brad King 07a54b2bb2 Merge topic 'target-bundle-dir-name-genex'
997af2e1a6 Genex: Add TARGET_BUNDLE_DIR_NAME
627b2eba6c Help: Make TARGET_BUNDLE[_CONTENT]_DIR examples more precise

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7177
2022-04-26 11:15:47 -04:00
Kitware Robot a0061a8cf9 CMake Nightly Date Stamp 2022-04-26 00:01:15 -04:00
Ben Boeckel 9916d4dd44 cmTarget: factor out fileset type handling
This allows for new fileset types to be added more easily by factoring
out the declarative information into a structure.
2022-04-25 16:49:57 -04:00
Ben Boeckel d74f9599f6 cmTarget: require filesets to be of the right type
With new types being proposed for C++ modules, requiring filesets to be
of the right type is now pertinent. No tests can be added yet as only
`HEADERS` is supported right now.
2022-04-25 14:29:17 -04:00
Ben Boeckel 5da4fe30a9 cmTarget: factor out fileset property manipulation 2022-04-25 14:29:17 -04:00
Ben Boeckel c89580487b cmTarget: pass candidate strings by const-ref
This avoids having to copy the `std::string` overload.
2022-04-25 14:29:17 -04:00
Ben Boeckel 64ea1a272c messages: remove screamake from comments and errors 2022-04-25 14:29:17 -04:00
Kitware Robot c6ead9be83 CMake Nightly Date Stamp 2022-04-25 00:01:23 -04:00
Kitware Robot f109faf450 CMake Nightly Date Stamp 2022-04-24 00:01:09 -04:00
Kitware Robot 5b21ca7302 CMake Nightly Date Stamp 2022-04-23 00:01:21 -04:00
Brad King bcd98b5f98 Merge topic 'cmake-use-findpython'
313ea361b0 CMake: Use FindPython instead of FindPythonInterp to build CMake itself
b6a6190877 string(): Support hash functions in bootstrap

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7197
2022-04-22 09:38:43 -04:00
Ben Leadbetter 997af2e1a6 Genex: Add TARGET_BUNDLE_DIR_NAME
Evaluate to the name of the bundle directory for a given bundle target.

Fixes: #23409
2022-04-22 09:23:46 -04:00
Brad King f415b457e3 Merge topic 'cmake-install-script-gen-style'
4085128586 generated-scripts: use CMAKE_CURRENT_LIST_DIR where possible
a1a7f62918 generated-scripts: improve prose messages with CMake lists
c2194176db generated-scripts: unset used variables
233997a914 generated-scripts: use `foreach(IN LISTS)`
2ec44be41e generated-scripts: quote variable expansions
d74761b181 generated-scripts: simplify `if` conditions
59cc92085e generated-cmake: use `_cmake_` prefixes for local variables
a2cb1754a5 cmExportFileGenerator: require CMake 2.8.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7194
2022-04-22 09:02:34 -04:00
Brad King 8e666c2027 Merge topic 'ghs-rerun-cmake-fix'
1de3382de5 GHS: Fix RERUN_CMAKE issue when generation step fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7183
2022-04-22 09:00:07 -04:00
Brad King 1bd85e8f3f Merge topic 'NO_CMAKE_INSTALL_PREFIX'
42f7e39789 Find: Support per call disabling of CMAKE_INSTALL_PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7163
2022-04-22 08:59:09 -04:00
Kitware Robot bcf0b79d66 CMake Nightly Date Stamp 2022-04-22 00:01:18 -04:00
Kyle Edwards b6a6190877 string(): Support hash functions in bootstrap
cmCryptoHash has been included in the bootstrap script since 596439b.
Add hash support to string() in bootstrap to allow FindPython to work.
2022-04-21 14:23:30 -04:00
Brad King 89ede9c3e4 Merge topic 'cpack-command-line-arguments'
87c762d435 CPack: Use cmCommandLineArgument instead of cmsys::CommandLineArguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7185
2022-04-21 11:54:36 -04:00
Brad King 49c96c6508 Merge topic 'file-set-build-export'
9ee47188c0 cmExportBuildFileGenerator: handle genex-wrapped source paths
60fab8a6e0 cmInstallCommand: tweak error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7182
2022-04-21 11:49:40 -04:00
Kitware Robot cd22d5f419 CMake Nightly Date Stamp 2022-04-21 00:01:17 -04:00
Ben Boeckel 4085128586 generated-scripts: use CMAKE_CURRENT_LIST_DIR where possible 2022-04-20 15:36:21 -04:00
Ben Boeckel a1a7f62918 generated-scripts: improve prose messages with CMake lists
Instead of printing a CMake list, make it an English-style list. This
also allows the line-break algorithm to make these messages much more
readable.
2022-04-20 15:36:21 -04:00
Ben Boeckel c2194176db generated-scripts: unset used variables 2022-04-20 15:36:20 -04:00
Ben Boeckel 233997a914 generated-scripts: use foreach(IN LISTS) 2022-04-20 15:34:28 -04:00
Ben Boeckel 2ec44be41e generated-scripts: quote variable expansions 2022-04-20 15:34:06 -04:00
Ben Boeckel d74761b181 generated-scripts: simplify if conditions 2022-04-20 15:33:34 -04:00
Ben Boeckel 59cc92085e generated-cmake: use _cmake_ prefixes for local variables
This avoids stomping on any user variables.
2022-04-20 15:33:06 -04:00
Ben Boeckel a2cb1754a5 cmExportFileGenerator: require CMake 2.8.3
This allows use of `CMAKE_CURRENT_LIST_DIR`, `foreach(IN LISTS)`,
`if(VERSION_*)`, and more.

Note that generated filesets code already uses `if(VERSION_*)` and
requires CMake 2.8.3 in practice.
2022-04-20 14:09:46 -04:00
Kyle Edwards 87c762d435 CPack: Use cmCommandLineArgument instead of cmsys::CommandLineArguments 2022-04-20 11:45:28 -04:00
Brad King 722e4d4619 Merge topic 'cpack-dmg-sla'
b760828d3f CPack/DMG: Do not use CPACK_RESOURCE_FILE_LICENSE for SLA by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7176
2022-04-20 11:38:15 -04:00
Brad King ac68695b94 Merge topic 'vs-dotnet-startup-object'
d89af11f89 VS: Add StartupObject property for managed .NET projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7171
2022-04-20 11:35:03 -04:00
Brad King 686df6e136 Merge topic 'cmake-gui-font'
072b318893 cmake-gui: avoid undefined font in recent macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7178
2022-04-20 11:30:57 -04:00
Brad King 1d5285887c Merge topic 'command-line-argument-bool'
62f4a41647 Refactor: Use cmCommandLineArgument::setTo{True,Value}()
0645d08c98 cmCommandLineArgument: Add setToTrue() and setToValue() helpers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !7181
2022-04-20 11:30:05 -04:00
Kitware Robot 5ea743e759 CMake Nightly Date Stamp 2022-04-20 00:01:12 -04:00
Kitware Robot 33a847c84d CMake Nightly Date Stamp 2022-04-19 00:01:08 -04:00
Kyle Edwards 62f4a41647 Refactor: Use cmCommandLineArgument::setTo{True,Value}() 2022-04-18 16:22:51 -04:00
Kyle Edwards 0645d08c98 cmCommandLineArgument: Add setToTrue() and setToValue() helpers 2022-04-18 16:22:39 -04:00
Ben Boeckel 9ee47188c0 cmExportBuildFileGenerator: handle genex-wrapped source paths
Previously a fileset with `$<$<CONFIG:Debug>:some_file>` would show up
as-is (with escaping) in the build directory export. Instead, evaluate
all fileset entries as generator expressions and list them as they are
similar to the installation information.
2022-04-18 13:43:18 -04:00
Kitware Robot 993ba4b688 CMake Nightly Date Stamp 2022-04-18 00:01:34 -04:00
Kitware Robot 42b486ab34 CMake Nightly Date Stamp 2022-04-17 00:01:10 -04:00
Fred Baksik 1de3382de5 GHS: Fix RERUN_CMAKE issue when generation step fails
Fixes: 23435
2022-04-16 07:54:46 -04:00
Kitware Robot c279845ee7 CMake Nightly Date Stamp 2022-04-16 00:01:21 -04:00