summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 branch 'release-3.19'Marc Chevrier2020-11-280-0/+0
|\
| * Merge topic 'FPHSA-usable-outside-find_package' into release-3.19Marc Chevrier2020-11-281-2/+7
| |\ | | | | | | | | | | | | | | | | | | 14ecf9c2f6 FPHSA: ensure it can be used outside 'find_package' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5539
* | \ Merge topic 'FPHSA-usable-outside-find_package'Marc Chevrier2020-11-281-2/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 14ecf9c2f6 FPHSA: ensure it can be used outside 'find_package' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5539
| * | FPHSA: ensure it can be used outside 'find_package'Marc Chevrier2020-11-251-2/+7
| | | | | | | | | | | | Fixes: #21505
* | | CMake Nightly Date StampKitware Robot2020-11-281-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2020-11-271-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2020-11-261-1/+1
| | |
* | | Merge branch 'release-3.19'Brad King2020-11-250-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'ci-xcode-12.2' into release-3.19Brad King2020-11-252-4/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5213328008 gitlab-ci: update macOS jobs to use Xcode 12.2 928ca50b6f Tests: Teach RunCMake to ignore Xcode install_name_tool signature warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5534
* | \ \ Merge topic 'ci-xcode-12.2'Brad King2020-11-252-4/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 5213328008 gitlab-ci: update macOS jobs to use Xcode 12.2 928ca50b6f Tests: Teach RunCMake to ignore Xcode install_name_tool signature warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5534
| * | | gitlab-ci: update macOS jobs to use Xcode 12.2Brad King2020-11-241-4/+4
| | | |
| * | | Tests: Teach RunCMake to ignore Xcode install_name_tool signature warningsBrad King2020-11-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `install_name_tool` may warn: install_name_tool: warning: changes being made to the file will invalidate the code signature in: ... Teach RunCMake to drop such incidental lines before matching against expected output.
* | | | Merge branch 'release-3.19'Brad King2020-11-250-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'test-java-default' into release-3.19Brad King2020-11-252-6/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1af2d1d0ea Tests: Add CMake_TEST_Java option to control Java tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5532
* | \ \ \ Merge topic 'test-java-default'Brad King2020-11-252-6/+12
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 1af2d1d0ea Tests: Add CMake_TEST_Java option to control Java tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5532
| * | | | Tests: Add CMake_TEST_Java option to control Java testsBrad King2020-11-242-6/+12
| | |/ / | |/| |
* | | | Merge branch 'release-3.18'Brad King2020-11-250-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'cuda_detect_vs_codegen' into release-3.18Brad King2020-11-251-4/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5531
* | \ \ \ \ Merge branch 'release-3.19'Brad King2020-11-250-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'cuda_detect_vs_codegen' into release-3.19Brad King2020-11-251-4/+8
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | | | | | | | | | | | | 20807a1882 CUDA: Fix user-set architectures during detection with Visual Studio Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5531
* | | | | Merge topic 'cuda_detect_vs_codegen'Brad King2020-11-251-4/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 20807a1882 CUDA: Fix user-set architectures during detection with Visual Studio Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5531
| * | | | CUDA: Fix user-set architectures during detection with Visual StudioRaul Tambre2020-11-251-4/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user specifies CMAKE_CUDA_ARCHITECTURES we use those during detection and error out if they don't work. For Visual Studio a dummy project file is used instead of invoking the compiler directly. NVCC would thus use its default and we'd fail if CMAKE_CUDA_ARCHITECTURES was anything other than NVCC's default. Use the necessary project file variable in CMakeDetermineCompilerId.cmake to match other generators. Fixes #21492.
* | | | CMake Nightly Date StampKitware Robot2020-11-251-1/+1
| | | |
* | | | Merge topic 'doc-dev-experimental'Brad King2020-11-242-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d231d92289 Help/dev: Add a CMake Experimental Features Guide Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5535
| * | | | Help/dev: Add a CMake Experimental Features GuideBrad King2020-11-242-0/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | Initialize it with placeholder content. This document will serve to contain documentation for experimental features that are under development and not yet included in official documentation.
* | | | Merge branch 'release-3.19'Brad King2020-11-240-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | CMake 3.19.1v3.19.1Brad King2020-11-241-1/+1
| | | |
* | | | Merge branch 'release-3.19'Brad King2020-11-240-0/+0
|\ \ \ \ | |/ / /
| * | | Merge topic 'policy-cmp0111-iface' into release-3.19Brad King2020-11-247-40/+65
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54ef732b0c cmVisualStudio10TargetGenerator: Avoid GetFullPath on INTERFACE library f06f4b517c cmTarget: Do not enforce CMP0111 on imported INTERFACE libraries 43c95df8fb Tests: Match RunCMake.CMP0111 stderr more strictly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5530
* | \ \ \ Merge topic 'policy-cmp0111-iface'Brad King2020-11-247-40/+65
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54ef732b0c cmVisualStudio10TargetGenerator: Avoid GetFullPath on INTERFACE library f06f4b517c cmTarget: Do not enforce CMP0111 on imported INTERFACE libraries 43c95df8fb Tests: Match RunCMake.CMP0111 stderr more strictly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5530
| * | | | cmVisualStudio10TargetGenerator: Avoid GetFullPath on INTERFACE libraryBrad King2020-11-231-1/+2
| | | | | | | | | | | | | | | | | | | | Issue: #21470
| * | | | cmTarget: Do not enforce CMP0111 on imported INTERFACE librariesBrad King2020-11-234-32/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic added by commit 359c500a24 (cmTarget: Raise error if imported target location is not set, 2020-08-08, v3.19.0-rc1~273^2) to exclude INTERFACE libraries from the policy. They have no location. Fixes: #21470
| * | | | Tests: Match RunCMake.CMP0111 stderr more strictlyBrad King2020-11-232-7/+27
| | | | |
* | | | | Merge branch 'release-3.19'Brad King2020-11-240-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'fix-find-make-program' into release-3.19Brad King2020-11-244-1/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef91fb02f3 cmGlobalGenerator: FindMakeProgram() at a generator-specific time Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Frank Dana <ferdnyc@gmail.com> Merge-request: !5529
* | \ \ \ \ Merge topic 'fix-find-make-program'Brad King2020-11-244-1/+29
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef91fb02f3 cmGlobalGenerator: FindMakeProgram() at a generator-specific time Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Frank Dana <ferdnyc@gmail.com> Merge-request: !5529
| * | | | | cmGlobalGenerator: FindMakeProgram() at a generator-specific timeKyle Edwards2020-11-234-1/+29
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5b5c192 moved FindMakeProgram() to an earlier time, which resulted in CMAKE_MAKE_PROGRAM not being read from the toolchain file. Change it to only call FindMakeProgram() early in the specific cases of Visual Studio and Xcode, and restore the old behavior for all other generators. Fixes: #21486
* | | | | Merge branch 'release-3.19'Brad King2020-11-240-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'xcode-cc-work-dir' into release-3.19Brad King2020-11-246-3/+38
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36921d2d23 Xcode: Fix custom command work-dir placeholders in "new build system" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5527
* | \ \ \ \ Merge topic 'xcode-cc-work-dir'Brad King2020-11-246-3/+38
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 36921d2d23 Xcode: Fix custom command work-dir placeholders in "new build system" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5527
| * | | | | Xcode: Fix custom command work-dir placeholders in "new build system"Brad King2020-11-236-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The placeholders for `CONFIGURATION` and `EFFECTIVE_PLATFORM_NAME` need to be handled in the `WORKING_DIRECTORY` of custom commands just as we already do for the `COMMAND`. Fixes: #21483
* | | | | | Merge branch 'release-3.19'Brad King2020-11-240-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'cmFileTime-fix-overflow' into release-3.19Brad King2020-11-242-27/+40
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | b4c994f69c cmFileTime: Fix overflow on time computation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5526
* | | | | Merge topic 'cmFileTime-fix-overflow'Brad King2020-11-242-27/+40
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | b4c994f69c cmFileTime: Fix overflow on time computation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5526
| * | | | cmFileTime: Fix overflow on time computationMarc Chevrier2020-11-232-27/+40
| | |/ / | |/| | | | | | | | | | | | | | | | | | On Windows, time starting point is Januray, 1st of 1601. So computing number of nanoseconds from this date exceeds 64bit capabilities.