Commit Graph

32302 Commits

Author SHA1 Message Date
Josiah Bills 7a2496daad VS: Add support for SYSTEM include directories
Fixes: #17904
2022-05-18 18:52:00 -04:00
Brad King e0dbca93aa Merge topic 'find_item-query-windows-registry'
8d7e80cf3d find_* commands: add control over Windows registry views
08941a9a40 cmWindowsRegistry: Add helper for conversion between string and enum View
769f25aa3c cmWindowsRegistry: enhance unicode conversions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7211
2022-05-03 11:31:04 -04:00
Brad King 29062b23cf Merge topic 'avoid-remove-empty-path'
71ded12a75 cmGeneratedFileStream: Do not remove empty path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7223
2022-05-03 11:25:09 -04:00
Brad King e253e57fe3 Merge topic 'restore-CPACK_PACKAGEMAKER_CHOICES'
d099136add productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7220
2022-05-03 11:24:11 -04:00
Brad King 386496a544 Merge topic 'cpp-modules-prep'
c5b56b35c2 cmInstallExportGenerator: expose the temporary directory
c107760417 cmNinjaTargetGenerator: support msvc-style deps discovery for scanning
64c15ec018 cmNinjaTargetGenerator: add flags for scanning based on the fileset type
aaa18f15cf cmTarget: add support for querying all file set names
cc4e19710d cmGlobalNinjaGenerator: use an extention based on the modmapfmt
97a68198c9 cmGlobalNinjaGenerator: escape `:` in module names
499009b79c cmTarget: avoid creating export entries if they don't exist
0513a1fe10 cmInstallGenerator: use CMake-private variables in generated code
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7214
2022-05-03 11:20:26 -04:00
Kitware Robot ef10e61b6b CMake Nightly Date Stamp 2022-05-03 00:01:05 -04:00
Kitware Robot 8dbf38eaaf CMake Nightly Date Stamp 2022-05-02 00:01:17 -04:00
Kitware Robot 5327176fc2 CMake Nightly Date Stamp 2022-05-01 00:01:04 -04:00
Kitware Robot 833e952583 CMake Nightly Date Stamp 2022-04-30 00:01:07 -04:00
Marc Chevrier 8d7e80cf3d find_* commands: add control over Windows registry views
Fixes: #22775
2022-04-29 22:00:02 +02:00
Brad King 71ded12a75 cmGeneratedFileStream: Do not remove empty path
If `Close()` is called when a file was never opened, we have no
temporary file path.  Do not try to remove it.  Some implementations of
`unlink()` crash on an empty path (though the documented behavior is to
fail with `ENOENT`).

Fixes: #23414
2022-04-29 11:56:59 -04:00
Marc Chevrier 08941a9a40 cmWindowsRegistry: Add helper for conversion between string and enum View 2022-04-29 16:51:17 +02:00
Marc Chevrier 769f25aa3c cmWindowsRegistry: enhance unicode conversions 2022-04-29 16:51:17 +02:00
Craig Scott d099136add productbuild: Restore CPACK_PACKAGEMAKER_CHOICES variable
In 2a8df7e7db (productbuild: Don't write rootVolumeOnly attribute if
writing domains, 2022-03-21), the variable holding the main contents
of the distribution.dist XML file was renamed from
CPACK_PACKAGEMAKER_CHOICES to CPACK_APPLE_PKG_INSTALLER_CONTENT.
This reflected the fact that the PackageMaker generator is deprecated.
The new variable also includes more details than the old one held.
Some projects were relying on the old variable name, so we need to still
set that to the same contents as it would have previously provided.

Neither of these variables were previously documented, but the older
variable was mentioned in enough semi-official places that it essentially
became semi-supported. Document both variables and highlight that the
older one is deprecated.

Fixes: #23467
2022-04-30 00:28:05 +10:00
Kitware Robot 3585d117e8 CMake Nightly Date Stamp 2022-04-29 00:01:06 -04:00
Brad King c70482461e Merge topic 'ghs-file-type'
158d6252cc GHS: Set LANGUAGE type for source files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7209
2022-04-28 09:43:04 -04:00
Ben Boeckel c5b56b35c2 cmInstallExportGenerator: expose the temporary directory
This needs to be known so that C++ module properties for the install can
be staged beside the other files.

Always perform the MD5 transformation (in non-bootstrap builds) so that
the path can be computed prior to generation (where it used the longest
configuration name to detect too-long paths). Update tests to expect the
always-present MD5 value. Note that this improves robustness of the test
suite as testing in a too-long path may have triggered the MD5
conversion anyways.
2022-04-28 09:13:48 -04:00
Kitware Robot 86472acd64 CMake Nightly Date Stamp 2022-04-28 00:01:22 -04:00
Ben Boeckel c107760417 cmNinjaTargetGenerator: support msvc-style deps discovery for scanning 2022-04-27 18:39:01 -04:00
Ben Boeckel 64c15ec018 cmNinjaTargetGenerator: add flags for scanning based on the fileset type 2022-04-27 15:14:50 -04:00
Ben Boeckel aaa18f15cf cmTarget: add support for querying all file set names 2022-04-27 15:04:01 -04:00
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
Fred Baksik 158d6252cc GHS: Set LANGUAGE type for source files
Use gbuild project syntax for setting the language type for the file.
gbuild will pick the correct compiler or tool to use.

NOTE: Language names come from gbuild config files.  Therefore to
compile a file with the C++ compiler use "C++" not "CXX".

The previous implementation was passing the C compiler a flag to compile as C++
if LANGUAGE was set to "CXX".
2022-04-27 10:33:51 -04:00
Brad King 1d82670bd4 Merge topic 'automoc-rsp'
1c9cead051 AUTOMOC: Automatically use options file for moc compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7201
2022-04-27 08:56:51 -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
Daniel Gehriger 1c9cead051 AUTOMOC: Automatically use options file for moc compiler 2022-04-26 20:43:00 +02: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