mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-30 11:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,889 Commits 2 Branches 401 Tags
b6068ce407e541b13fc0484bc6b84e896c9913e8
Commit Graph

50889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Chevrier b6068ce407 Refactoring: enhance include file filtering 
In preparation of support of 'CMAKE_DEPENDS_IN_PROJECT_ONLY'
when dependencies are generated by the compiler.
 2020-11-28 16:02:58 +01:00
Marc Chevrier 3401403f69 Refactoring: Introduce place-holder for dependency target. 
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
 2020-11-28 16:02:58 +01:00
Marc Chevrier a97c41bf8b Refactoring: Makefiles Generators: Add support for various depends scanners 2020-11-28 16:02:58 +01:00
Marc Chevrier bcf19af5c7 Merge branch 'release-3.19' 2020-11-28 09:02:54 -05:00
Marc Chevrier 8ac63eb4b8 Merge topic 'FPHSA-usable-outside-find_package' 
14ecf9c2f6 FPHSA: ensure it can be used outside 'find_package'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5539
 2020-11-28 09:02:54 -05:00
Marc Chevrier 72ede0218d Merge topic 'FPHSA-usable-outside-find_package' into release-3.19 
14ecf9c2f6 FPHSA: ensure it can be used outside 'find_package'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5539
 2020-11-28 09:02:54 -05:00
Kitware Robot 993cdf6ae2 CMake Nightly Date Stamp 2020-11-28 00:01:06 -05:00
Kitware Robot 70f11b9d3c CMake Nightly Date Stamp 2020-11-27 00:01:07 -05:00
Kitware Robot 327d5c52bd CMake Nightly Date Stamp 2020-11-26 00:01:10 -05:00
Marc Chevrier 14ecf9c2f6 FPHSA: ensure it can be used outside 'find_package' 
Fixes: #21505
 2020-11-25 16:36:12 +01:00
Brad King 9e83e77129 Merge topic 'ci-xcode-12.2' into release-3.19 
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
 2020-11-25 08:38:56 -05:00
Brad King 7137dff083 Merge branch 'release-3.19' 2020-11-25 08:38:56 -05:00
Brad King af966ec25c Merge topic 'ci-xcode-12.2' 
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
 2020-11-25 08:38:56 -05:00
Brad King 885897e7a0 Merge branch 'release-3.19' 2020-11-25 08:38:07 -05:00
Brad King 90648f205e Merge topic 'test-java-default' into release-3.19 
1af2d1d0ea Tests: Add CMake_TEST_Java option to control Java tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5532
 2020-11-25 08:38:06 -05:00
Brad King 52c8c4b826 Merge topic 'test-java-default' 
1af2d1d0ea Tests: Add CMake_TEST_Java option to control Java tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5532
 2020-11-25 08:38:06 -05:00
Brad King ac13652a7c Merge branch 'release-3.18' 2020-11-25 08:36:13 -05:00
Brad King 035a0c497a Merge branch 'cuda_detect_vs_codegen' into release-3.18 
Merge-request: !5531
 2020-11-25 08:35:13 -05:00
Brad King 37add87632 Merge topic 'cuda_detect_vs_codegen' into release-3.19 
20807a1882 CUDA: Fix user-set architectures during detection with Visual Studio

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5531
 2020-11-25 08:35:08 -05:00
Brad King 4fa82d5865 Merge branch 'release-3.19' 2020-11-25 08:35:08 -05:00
Brad King 0e28b39f41 Merge topic 'cuda_detect_vs_codegen' 
20807a1882 CUDA: Fix user-set architectures during detection with Visual Studio

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5531
 2020-11-25 08:35:08 -05:00
Raul Tambre 20807a1882 CUDA: Fix user-set architectures during detection with Visual Studio 
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.
 2020-11-25 08:27:40 -05:00
Kitware Robot a35dc641ae CMake Nightly Date Stamp 2020-11-25 00:01:08 -05:00
Brad King f32026f12d Merge topic 'doc-dev-experimental' 
d231d92289 Help/dev: Add a CMake Experimental Features Guide

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5535
 2020-11-24 16:31:36 -05:00
Brad King d231d92289 Help/dev: Add a CMake Experimental Features Guide 
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.
 2020-11-24 16:29:34 -05:00
Brad King 5213328008 gitlab-ci: update macOS jobs to use Xcode 12.2 2020-11-24 14:36:20 -05:00
Brad King 928ca50b6f Tests: Teach RunCMake to ignore Xcode install_name_tool signature warnings 
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.
 2020-11-24 14:33:59 -05:00
Brad King 1af2d1d0ea Tests: Add CMake_TEST_Java option to control Java tests 2020-11-24 13:29:30 -05:00
Brad King 5b8b8386f5 Merge branch 'release-3.19' 2020-11-24 09:43:07 -05:00
Brad King 64fb825438 CMake 3.19.1 v3.19.1 2020-11-24 08:50:26 -05:00
Brad King 94f5637e11 Merge branch 'release-3.19' 2020-11-24 08:43:22 -05:00
Brad King 1f1d705154 Merge topic 'policy-cmp0111-iface' into release-3.19 
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
 2020-11-24 08:43:22 -05:00
Brad King adf3ea701d Merge topic 'policy-cmp0111-iface' 
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
 2020-11-24 08:43:22 -05:00
Brad King db6b10b219 Merge branch 'release-3.19' 2020-11-24 08:42:33 -05:00
Brad King aee981e208 Merge topic 'fix-find-make-program' 
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
 2020-11-24 08:42:33 -05:00
Brad King aeb0e40111 Merge topic 'fix-find-make-program' into release-3.19 
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
 2020-11-24 08:42:32 -05:00
Brad King ec880f9f35 Merge branch 'release-3.19' 2020-11-24 08:41:24 -05:00
Brad King 2bca5fa6aa Merge topic 'xcode-cc-work-dir' 
36921d2d23 Xcode: Fix custom command work-dir placeholders in "new build system"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5527
 2020-11-24 08:41:24 -05:00
Brad King 6b4bb3bf7f Merge topic 'xcode-cc-work-dir' into release-3.19 
36921d2d23 Xcode: Fix custom command work-dir placeholders in "new build system"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5527
 2020-11-24 08:41:23 -05:00
Brad King e7a06f93c2 Merge branch 'release-3.19' 2020-11-24 08:40:09 -05:00
Brad King 2ca9016376 Merge topic 'cmFileTime-fix-overflow' into release-3.19 
b4c994f69c cmFileTime: Fix overflow on time computation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5526
 2020-11-24 08:40:08 -05:00
Brad King da234c87c3 Merge topic 'cmFileTime-fix-overflow' 
b4c994f69c cmFileTime: Fix overflow on time computation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5526
 2020-11-24 08:40:08 -05:00
Kitware Robot 39ee591a2f CMake Nightly Date Stamp 2020-11-24 00:01:08 -05:00
Brad King 54ef732b0c cmVisualStudio10TargetGenerator: Avoid GetFullPath on INTERFACE library 
Issue: #21470
 2020-11-23 15:57:05 -05:00
Brad King f06f4b517c cmTarget: Do not enforce CMP0111 on imported INTERFACE libraries 
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
 2020-11-23 15:56:28 -05:00
Brad King 43c95df8fb Tests: Match RunCMake.CMP0111 stderr more strictly 2020-11-23 15:50:58 -05:00
Kyle Edwards ef91fb02f3 cmGlobalGenerator: FindMakeProgram() at a generator-specific time 
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
 2020-11-23 14:20:08 -05:00
Brad King ee53b1af19 Merge topic 'doc-removed-UseJava-modules' 
51ee82ddc6 Help: Restore documentation placeholder for removed modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5523
 2020-11-23 11:25:31 -05:00
Brad King d1b6879ece Merge topic 'ctest_custom_versions' into release-3.19 
6e7625989c Help: Fix `.. versionadded` directives for CTEST_CUSTOM_* variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5524
 2020-11-23 11:24:22 -05:00
Brad King 61d3a4317f Merge branch 'release-3.19' 2020-11-23 11:24:22 -05:00