summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Fix version note for CMAKE_PROJECT_<PROJECT-NAME>_INCLUDENikita Nemkin2020-12-021-2/+3
| | | | | | This variable predates 3.0. Fixes: #21522
* Help: Fix cmake_parse_arguments version noteNikita Nemkin2020-12-021-2/+4
| | | | Don't imply that cmake_parse_arguments() requires CMake 3.5+.
* Help: Improve styling for versionadded/deprecated directivesNikita Nemkin2020-12-021-0/+6
| | | | | | | Sphinx theme CSS removes top margin for dd > p combination, but directives add an intervening div and need a separate rule. Issue: #19715
* Tests: Make RunCMake.CMP0106 expected output robust to line number changesBrad King2020-12-022-3/+3
|
* Merge topic 'cuda_env_archs'Brad King2020-12-018-2/+34
|\ | | | | | | | | | | | | | | c57541d874 CUDA: Fix tests with CUDAARCHS set c4ae9384ff CUDA: Initialize CMAKE_CUDA_ARCHITECTURES using $ENV{CUDAARCHS} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5533
| * CUDA: Fix tests with CUDAARCHS setRaul Tambre2020-11-303-1/+8
| | | | | | | | | | | | | | With CUDAARCHS there's the possibility of tests being run with multiple architectures or having CMAKE_CUDA_ARCHITECTURES set with NVCC despite CMP0104 being OLD. Fix a few tests to work properly in such cases.
| * CUDA: Initialize CMAKE_CUDA_ARCHITECTURES using $ENV{CUDAARCHS}Raul Tambre2020-11-305-1/+26
| | | | | | | | | | | | | | NVCC's default architecture may be newer than the one supported by the machine's GPU. In such cases it's useful to have an environment variable for initializing CMAKE_CUDA_ARCHITECTURES to avoid specifying it for every invocation.
* | Merge topic 'cmprop-improve'Brad King2020-12-011-25/+18
|\ \ | | | | | | | | | | | | | | | | | | 4d9b1b42bc cmCTestBuildCommand: code improvement Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5548
| * | cmCTestBuildCommand: code improvementVitaly Stakhovsky2020-11-291-25/+18
| | |
* | | Merge topic 'Help-FindPython-add-version-information'Brad King2020-12-013-40/+242
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ee6f37d606 Help: FindPython: add version information Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5554
| * | | Help: FindPython: add version informationMarc Chevrier2020-12-013-40/+242
| | | |
* | | | Merge topic 'xcode-check-object-lib-subprojects-fixed'Brad King2020-12-014-0/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31d3e64080 Tests: Add Xcode cases fixed by switch to the "new build system" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5549
| * | | | Tests: Add Xcode cases fixed by switch to the "new build system"Yauheni Khnykin2020-11-304-0/+70
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support of 'new build system' in Xcode fixes indirectly few issues which were caused by workaround with `XCODE_DEPEND_HELPER.cmake` autogenerated script. This patch adds test which is originated from issue #20260 and reproduces this issue when 'new build system' is disabled. Fixes: #20260
* | | | Merge branch 'release-3.19'Brad King2020-12-010-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'windows-clang-LINKER-prefix' into release-3.19Brad King2020-12-011-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ac9876757 Clang on Windows: 'LINKER:' prefix must be honored Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5551
* | \ \ \ \ Merge topic 'windows-clang-LINKER-prefix'Brad King2020-12-011-0/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ac9876757 Clang on Windows: 'LINKER:' prefix must be honored Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5551
| * | | | | Clang on Windows: 'LINKER:' prefix must be honoredMarc Chevrier2020-11-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21094
* | | | | | Merge topic 'compile_def_doc'Brad King2020-12-011-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b9fcadc9a Help: Describe definition values in target_compile_definitions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5547
| * | | | | | Help: Describe definition values in target_compile_definitionsJuan Ramos2020-11-301-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20573
* | | | | | | Merge branch 'release-3.19'Brad King2020-12-010-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'ninja-regen-metadata' into release-3.19Brad King2020-12-014-7/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73d1c78bf4 ci: update to use ninja 1.10.2 11f4259362 Ninja: Clean metadata after regen during build on Windows with 1.10.2+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5555
* | \ \ \ \ \ \ Merge topic 'ninja-regen-metadata'Brad King2020-12-014-7/+16
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73d1c78bf4 ci: update to use ninja 1.10.2 11f4259362 Ninja: Clean metadata after regen during build on Windows with 1.10.2+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5555
| * | | | | | | ci: update to use ninja 1.10.2Brad King2020-11-302-5/+5
| | | | | | | |
| * | | | | | | Ninja: Clean metadata after regen during build on Windows with 1.10.2+Brad King2020-11-302-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja 1.10.2 fixes support for `generator = 1` rules that run metadata update commands during regeneration while a build is running. Update the condition added by commit ccaa0bccc4 (Ninja: Do not clean metadata when re-generating inside a running build, 2020-01-27, v3.17.0-rc1~73^2) to remove our workaround when Ninja is new enough. Fixes: #20274
* | | | | | | | Merge branch 'release-3.19'Brad King2020-12-010-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'pch-ios-multi-arch-nmc' into release-3.19Brad King2020-12-011-2/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35432aabda PCH: Fix compiler errors on iOS multi-arch using Ninja Multi-Config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5544
* | | | | | | | Merge topic 'pch-ios-multi-arch-nmc'Brad King2020-12-011-2/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35432aabda PCH: Fix compiler errors on iOS multi-arch using Ninja Multi-Config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5544
| * | | | | | | PCH: Fix compiler errors on iOS multi-arch using Ninja Multi-ConfigCristian Adam2020-11-301-2/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #21401
* | | | | | | CMake Nightly Date StampKitware Robot2020-12-011-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'makefiles-compiler-deps-optims'Brad King2020-11-3069-375/+1413
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c71d051fa Makefiles Generators: use compiler for dependencies generation afd0f6785d Refactoring: Abstract Makefile line continuation format b6068ce407 Refactoring: enhance include file filtering 3401403f69 Refactoring: Introduce place-holder for dependency target. a97c41bf8b Refactoring: Makefiles Generators: Add support for various depends scanners Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !5528
| * | | | | | Makefiles Generators: use compiler for dependencies generationMarc Chevrier2020-11-2952-270/+1312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each source compilation generates a dependencies file. These dependencies files are consolidated in one file per target. This consolidation is done as part of command 'cmake -E cmake_depends` launched before evaluation of makefile dependency graph. The consolidation uses the same approach as `CMake` dependencies management. Fixes: #21321
| * | | | | | Refactoring: Abstract Makefile line continuation formatMarc Chevrier2020-11-284-9/+6
| | | | | | |
| * | | | | | Refactoring: enhance include file filteringMarc Chevrier2020-11-281-24/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation of support of 'CMAKE_DEPENDS_IN_PROJECT_ONLY' when dependencies are generated by the compiler.
| * | | | | | Refactoring: Introduce place-holder for dependency target.Marc Chevrier2020-11-2820-66/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes are in preparation of compiler generated dependencies support for Makefiles generators * compiler output and dependency target can be different for Makefiles generators * resolve inconsistency naming for dependency file place-holder
| * | | | | | Refactoring: Makefiles Generators: Add support for various depends scannersMarc Chevrier2020-11-284-19/+28
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'make-GENERATED-visible-from-any-scope'Brad King2020-11-30208-56/+5860
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 573d51201a GENERATED prop: Set CMP0118 to NEW for some (unrelated) tests 6624b65b3f GENERATED prop: Add implementation for policy CMP0118 being set to NEW b14fe704f8 GENERATED prop: Simplify determining the language of a source file ca4ce458a3 GENERATED prop: Check CMP0118 policy and warn in certain situations 0eb30f175e GENERATED prop: Introducing policy CMP0118 and its documentation 78c8d95605 GENERATED prop: Add some tests before introducing changes with CMP0118 e01527619f Simplify code by calling a function directly instead of duplicating it 75cb8615e9 Fix typo in function name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5308
| * | | | | | GENERATED prop: Set CMP0118 to NEW for some (unrelated) testsDeniz Bahadir2020-11-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adjusting the (unrelated) RunCMake.Ninja test to set CMP0118 to `NEW`. * Adjusting the (unrelated) RunCMake.FileAPI test to set CMP0118 to `NEW`.
| * | | | | | GENERATED prop: Add implementation for policy CMP0118 being set to NEWDeniz Bahadir2020-11-2491-837/+2304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding implementation for policy CMP0118 being set to `NEW`. * Adding new tests for policy CMP0118 being set to `NEW`. * Checking the `GENERATED` property with `get_source_file_property` or `get_property` now always returns exactly `1` or `0`. No other values will be returned. Note, that this is a backwards-incompatible change, even when policy CMP0118 is unset or set to `OLD`. * Additionally, as `get_source_file_property` and `get_property` now always check if a source-file was marked globally visible, even when CMP0118 is unset or set to `OLD`, they possibly return `1` where they might have returned `0` before the changes introduced by this commit. Note, that this is a backwards-incompatible change, even when policy CMP0118 is unset or set to `OLD`. * As a consequence, the tests for policy CMP0118 being unset or set to `OLD` got slightly adjusted, too, to reflect these changes in behavior.
| * | | | | | GENERATED prop: Simplify determining the language of a source fileDeniz Bahadir2020-11-241-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplification will help the later following structural changes of class `cmSourceFile`.
| * | | | | | GENERATED prop: Check CMP0118 policy and warn in certain situationsDeniz Bahadir2020-11-2475-21/+1813
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding tests for CMP0118 being unset (aka set to `WARN`). * Adjusting the (unrelated) RunCMake.CMP0026 test to set CMP0118 to `NEW`, * Adjusting the (unrelated) RunCMake.Ninja test to set CMP0118 to `OLD`. * Adjusting the (unrelated) RunCMake.FileAPI test to set CMP0118 to `OLD`. Note: Setting CMP0118 to `NEW` and modifying the `GENERATED` property with `set_property` or `set_source_files_properties` will currently NOT set that property because the implementation is still to come.
| * | | | | | GENERATED prop: Introducing policy CMP0118 and its documentationDeniz Bahadir2020-11-249-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: This is currently only defining the CMP0118 policy and providing its documentation, however, the implementation is still not using it.
| * | | | | | GENERATED prop: Add some tests before introducing changes with CMP0118Deniz Bahadir2020-11-2482-0/+2492
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are tests which shall assure that the upcoming changes regarding the `GENERATED` source-file property and the associated new policy CMP0118 do not change (or only slightly change) the current, observable behavior when policy CMP0118 is set to `OLD`.
| * | | | | | Simplify code by calling a function directly instead of duplicating itDeniz Bahadir2020-11-191-6/+1
| | | | | | |
| * | | | | | Fix typo in function nameDeniz Bahadir2020-11-175-6/+6
| | | | | | |
* | | | | | | Merge branch 'release-3.19'Brad King2020-11-300-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'correct_check_compiler_flag_regression' into release-3.19Brad King2020-11-303-7/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72f6b4bfbe Modules: Rename Internal/CMake{CheckCompiler => TryCompilerOrLinker}Flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kumar Gala <kumar.gala@gmail.com> Merge-request: !5540
* | \ \ \ \ \ \ Merge topic 'correct_check_compiler_flag_regression'Brad King2020-11-303-7/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72f6b4bfbe Modules: Rename Internal/CMake{CheckCompiler => TryCompilerOrLinker}Flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kumar Gala <kumar.gala@gmail.com> Merge-request: !5540
| * | | | | | | Modules: Rename Internal/CMake{CheckCompiler => TryCompilerOrLinker}FlagRobert Maynard2020-11-253-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the `CheckPIESupported` helper functions so that they don't clobber other internal functions. Also rename them to document they can't be unified with `CheckCompilerFlag`. Fixes: #21497
* | | | | | | | Merge branch 'release-3.19'Brad King2020-11-300-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'enable-extensions-on-qnx' into release-3.19Brad King2020-11-301-3/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34f6d76755 QNX: Do not disable compiler extensions for CMake itself Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5537