summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'makefile-normalize-depfile'Brad King2021-07-063-6/+17
|\ | | | | | | | | | | | | | | | | 30926620bb Merge branch 'backport-3.21-makefile-normalize-depfile' 6bc6ffb9a9 Merge branch 'backport-3.20-makefile-normalize-depfile' 6a6efdcaed Makefiles: Normalize compiler-generated depfile paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6297
| * Merge branch 'backport-3.21-makefile-normalize-depfile'Brad King2021-07-023-6/+17
| |\
| | * Merge branch 'backport-3.20-makefile-normalize-depfile'Brad King2021-07-023-6/+17
| | |\
| | | * Makefiles: Normalize compiler-generated depfile pathsMarc Chevrier2021-07-023-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though Makefile generators pass source files and include directories by absolute path to the compiler, the compiler may generate depfile paths relative to the current working directory. For example, `ccache` with `CCACHE_BASEDIR` may transform paths this way. When reading a depfile, convert relative dependencies to absolute paths before placing them in `compiler_depend.make`, which is later evaluated in the top-level build directory. Fixes: #22364
| | | * CMake 3.20.5v3.20.5Brad King2021-06-211-1/+1
| | | |
| | | * Merge topic 'fix-flow-control-override' into release-3.20Brad King2021-06-173-8/+17
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c017098d4d CMake: Allow override of unexpected non-flow-control commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6232
| | | * | VS: Do not apply '/external:W*' flag table mapping on VS < 16.10Brad King2021-06-161-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 9054cd05e6 (VS: Add flag table entries for '/external:W*' flags in VS 16.10, 2021-05-28, v3.20.4~10^2) we map flags to the `ExternalWarningLevel` element. VS 16.9 does not support that element, but its `cl` compiler does support the `/external:W*` flags. Filter out the flag table entry on older VS versions. Fixes: #22308
| | | * | cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion methodBrad King2021-06-163-7/+19
| | | | | | | | | | | | | | | | | | | | Port from `cmGlobalVisualStudioVersionedGenerator`.
| | | * | cmGlobalVisualStudio10Generator: Move static functions to anonymous namespaceBrad King2021-06-161-4/+6
| | | | |
| | * | | CMake 3.21.0-rc2v3.21.0-rc2Brad King2021-06-301-1/+1
| | | | |
| | * | | Merge topic 'CMP0126-WARNING' into release-3.21Brad King2021-06-302-5/+22
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16208ac113 CMP0126: Add control for warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6282
| | * \ \ \ Merge topic 'vs-ARM64EC' into release-3.21Brad King2021-06-301-1/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da0f74b5a1 VS: Add ARM64EC to supported platforms for VS 16 and 17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6283
* | | | | | | CMake Nightly Date StampKitware Robot2021-07-061-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-07-051-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-07-041-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2021-07-031-1/+1
| | | | | | |
* | | | | | | Merge topic 'ctest_not_dart'Brad King2021-07-029-156/+124
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0962cbf21d help: update ctest attached file example 5489ce74b3 ctest: support <CTestMeasurement> for runtime measurements 7817aa6fa4 ctest: improve test for runtime labels Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6296
| * | | | | | | ctest: support <CTestMeasurement> for runtime measurementsZack Galbreath2021-07-019-156/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CTest to parse output for <CTestMeasurement> in addition to <DartMeasurement> for measurements defined at runtime. Use a new class (cmCTestTestMeasurementXMLParser) derived from cmXMLParser to parse the data and attributes these XML elements. This is an improvement over our previous approach of using a series of regular expressions. As part of this commit we also rename some member variables and methods to make their purpose more clear. DartStuff -> AllTestMeasurementsRegex DartStuff1 -> SingleTestMeasurementRegex DartString -> TestMeasurementsOutput GenerateDartOutput() -> GenerateCTestXML() GenerateRegressionImages() -> RecordCustomTestMeasurements() cmCTestRunTest::DartProcessing() -> ParseOutputForMeasurements()
* | | | | | | | Merge topic 'autogen-deps'Brad King2021-07-021-5/+23
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af11ea8d0c AutoGen: Fix needless compilation of mocs_compilation.cpp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6288
| * | | | | | | AutoGen: Fix needless compilation of mocs_compilation.cppJoerg Bornemann2021-07-011-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For an AUTOMOC'ed target foo, when depfiles are used, there are the following dependencies: foo_autogen -> foo_autogen/timestamp foo_autogen/mocs_compilation.cpp -> foo_autogen/timestamp The first is used to trigger AUTOGEN. The second erroneously triggers a recompilation of mocs_compilation.cpp when any source file of target foo is touched. Remove the latter dependency and replace it with an order-only dependency from foo_autogen/mocs_compilation.cpp to foo_autogen_timestamp_deps. That is achieved by making mocs_compilation.cpp or its per-configuration variants byproduct(s) of the timestamp file. Fixes: #22338
* | | | | | | | CMake Nightly Date StampKitware Robot2021-07-021-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'env-init-configs'Brad King2021-07-016-24/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef56eefc9b cmake: Allow CMAKE_CONFIGURATION_TYPES to be set by environment variable e216b9bbd3 cmake: Allow CMAKE_BUILD_TYPE to be set by environment variable 6986a382a9 Help: Document when CMAKE_BUILD_TYPE and CMAKE_CONFIGURATION_TYPES are set e96169a3ec Help: Cross-reference CMAKE_CONFIGURATION_TYPES from CMAKE_BUILD_TYPE 03bd9c4c10 cmMakefile: Add helper to initialize CMAKE_CONFIGURATION_TYPES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6291
| * | | | | | | | cmake: Allow CMAKE_CONFIGURATION_TYPES to be set by environment variableBrad King2021-06-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no `CMAKE_CONFIGURATION_TYPES` is explicitly specified while creating a new build tree, check for an environment variable of the same name. Issue: #20983
| * | | | | | | | cmake: Allow CMAKE_BUILD_TYPE to be set by environment variableBrad King2021-06-301-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no `CMAKE_BUILD_TYPE` is explicitly specified while creating a new build tree, check for an environment variable of the same name. Issue: #20983
| * | | | | | | | cmMakefile: Add helper to initialize CMAKE_CONFIGURATION_TYPESBrad King2021-06-305-24/+18
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out duplicate code from the Ninja Multi-Config, Visual Studio, and Xcode generators.
* | | | | | | | Merge topic 'post-rel-dev'Brad King2021-07-012-6/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c209097b9 Configure CMake itself with policies through CMake 3.20 83a3db5631 export: Increase maximum policy version in exported files to 3.20 d76cb12905 Add deprecation warnings for policies CMP0088 and below Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6290
| * | | | | | | | export: Increase maximum policy version in exported files to 3.20Brad King2021-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files generatd by `install(EXPORT)` and `export()` commands are known to work with policies as of CMake 3.20, so enable them in sufficiently new CMake versions.
| * | | | | | | | Add deprecation warnings for policies CMP0088 and belowBrad King2021-06-301-4/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OLD behaviors of all policies are deprecated, but only by documentation. Add an explicit deprecation diagnostic for policies introduced in CMake 3.14 and below to encourage projects to port away from setting policies to OLD.
* | | | | | | | Merge topic 'cpackdeb-md5sums-order'Brad King2021-07-011-0/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0d3494afa Tests: update MD5SUMS test to have several files 9028195a22 CPackDeb: sort package files before generating deb file Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6287
| * | | | | | | CPackDeb: sort package files before generating deb fileAlexey Rogachevskiy2021-06-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make the order in which the files are added to md5sums and archives is stable, thus making package files more reproducible. Fixes: #22361
* | | | | | | | CMake Nightly Date StampKitware Robot2021-07-011-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'ninja-edit_cache'Brad King2021-06-307-48/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51bf4094fb Ninja: Use `ccmake` for `edit_cache` 7cb4ad7e39 cmGlobalCommonGenerator: Adopt GetEditCacheCommand 23af78bb78 cmGlobalCommonGenerator: Adopt GetEditCacheTargetName 1db4d74628 cmGlobalCommonGenerator: Add SupportsDirectConsole 61a737b088 cmGlobalNinjaGenerator: Rename SupportsConsolePool to SupportsDirectConsole Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6272
| * | | | | | | Ninja: Use `ccmake` for `edit_cache`NAKAMURA Takumi2021-06-293-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `ninja` is new enough to support the console pool, and `ccmake` is available, use it for `edit_cache`.
| * | | | | | | cmGlobalCommonGenerator: Adopt GetEditCacheCommandNAKAMURA Takumi2021-06-294-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the implementation from the Makefile generator so it can be later used by the Ninja generator too.
| * | | | | | | cmGlobalCommonGenerator: Adopt GetEditCacheTargetNameNAKAMURA Takumi2021-06-293-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation is the same for both Makefile and Ninja generators.
| * | | | | | | cmGlobalCommonGenerator: Add SupportsDirectConsoleNAKAMURA Takumi2021-06-292-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to `true` since this is used by Makefile generators. The Ninja generator already overrides it to use a version check.
| * | | | | | | cmGlobalNinjaGenerator: Rename SupportsConsolePool to SupportsDirectConsoleNAKAMURA Takumi2021-06-293-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a name that is not ninja-specific.
* | | | | | | | Merge topic 'CMP0126-WARNING'Brad King2021-06-302-5/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 616972197a Merge branch 'backport-3.21-CMP0126-WARNING' into CMP0126-WARNING 16208ac113 CMP0126: Add control for warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6282
| * \ \ \ \ \ \ \ Merge branch 'backport-3.21-CMP0126-WARNING' into CMP0126-WARNINGMarc Chevrier2021-06-292-5/+22
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | CMP0126: Add control for warningsMarc Chevrier2021-06-292-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22353
* | | | | | | | | Merge topic 'vs-ARM64EC'Brad King2021-06-301-1/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da0f74b5a1 VS: Add ARM64EC to supported platforms for VS 16 and 17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6283
| * | | | | | | | VS: Add ARM64EC to supported platforms for VS 16 and 17Brad King2021-06-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 4ea3a88625 (MSVC: Add support for targeting ARM64EC, 2020-12-30, v3.20.0-rc1~121^2) the `ARM64EC` platform was accidentally added to the list for VS 15 (2017) instead of VS 16 (2019). Its omission from the list of platforms was then repeated for VS 17 (2022). Issue: #21724
* | | | | | | | | Merge topic 'tll-out-of-dir'Brad King2021-06-302-7/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | e27a76f131 target_link_libraries: Restore transitive out-of-dir linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6285
| * | | | | | | target_link_libraries: Restore transitive out-of-dir linkingBrad King2021-06-292-7/+14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 7f506b95a7 (cmGeneratorTarget: Refactor link item lookup, 2021-05-26, v3.21.0-rc1~103^2~4) accidentally dropped the persistent lookup scope tracking across multiple items that was added by commit f0e67da061 (target_link_libraries: Fix out-of-dir linking of a list of targets, 2020-01-14, v3.17.0-rc1~149^2). This broke a transitive out-of-dir linking case not covered by our test suite. Restore the scope tracking and add a test case. Fixes: #22363
* | | | | | | CMake Nightly Date StampKitware Robot2021-06-301-1/+1
| | | | | | |
* | | | | | | Merge topic 'update-kwsys'Brad King2021-06-293-4/+23
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e9a32947b Merge branch 'upstream-KWSys' into update-kwsys bf4ae1c2b2 KWSys 2021-06-28 (0648cb1a) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Björn Esser <besser82@fedoraproject.org> Merge-request: !6266
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-06-283-4/+23
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-06-28 (0648cb1a)
| * | | | Merge topic 'vs2022' into release-3.21Brad King2021-06-288-2/+137
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93c718791e VS: Use 64-bit MSBuild in VS 2022 c46b265839 VS: Add Visual Studio 17 2022 generator b610b7a35c VS: Update v142 CL flag table for VS 17.0 Preview 1 43375c6418 Help: Remove unnecessary Sphinx versionadded markup in VS toolset selection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6268
* | | | | | CMake Nightly Date StampKitware Robot2021-06-291-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'target_compile_features-only-apply-to-enabled-languages'Brad King2021-06-281-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3cafa4237 compile_features: Ignore features that map to languages that aren't enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6255
generated by cgit v0.12 at 2025-02-21 23:02:22 (GMT)