mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 03:29:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
48,813 Commits 2 Branches 401 Tags
4f90fef85f6391e63dfae26bd6f290c59ea48e95
Commit Graph

48813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Scott 4f90fef85f Merge topic 'deprecate-pre-2.8.12' 
5845c218d7 Deprecate compatibility with CMake versions older than 2.8.12
7b07ccdd2b Tests/*Only: Update cmake_minimum_required versions
9b99b4bfc8 Tests/RunCMake: Update cmake_minimum_required versions
fcea4a3b45 cmStateSnapshot: Invert CanPopPolicyScope return value to match name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4897
 2020-06-23 09:36:03 -04:00
Brad King 67b8f9569f Merge branch 'release-3.18' 2020-06-23 08:50:55 -04:00
Brad King 0c001e54fd Merge topic 'doc-get_target_property' 
f4b911a2c9 Help: Update docs for failure result of get_target_property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4933
 2020-06-23 08:50:54 -04:00
Brad King 1f47a65c7a Merge topic 'doc-get_target_property' into release-3.18 
f4b911a2c9 Help: Update docs for failure result of get_target_property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4933
 2020-06-23 08:50:54 -04:00
Christopher Tetreault f4b911a2c9 Help: Update docs for failure result of get_target_property 
If `get_target_property` fails to find a value for a non-inherited
property, it appends `-NOTFOUND` to the var name and sets that as the
result, rather than setting the value of the var to `NOTFOUND`.
 2020-06-23 08:17:59 -04:00
Brad King eeff90389f Merge topic 'refactor_file_extension_queries' 
7628153edb Refactor file extension queries to be more consistent

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4925
 2020-06-23 08:14:01 -04:00
Brad King 81399d5438 Merge topic 'refactor_language_mapping_logic' 
c4e890946a try_compile: consistently add language properties
0e16da8233 cmCoreTryCompile use anonymous namespace instead of static

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4895
 2020-06-23 08:13:16 -04:00
Brad King a84c85310c Merge topic 'graphviz-cycles' 
ee5eb2eab4 Graphviz: add missing support for circular dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4926
 2020-06-23 08:12:23 -04:00
Brad King 64d58a6886 Merge branch 'release-3.18' 2020-06-23 08:00:32 -04:00
Brad King ba0ff76af3 Merge topic 'VxWorks-platform-id' into release-3.18 
b22586be01 VxWorks: Add Platform ID for Modules/CMakePlatformId.h.in

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4922
 2020-06-23 08:00:31 -04:00
Brad King 8c4d11fa52 Merge topic 'VxWorks-platform-id' 
b22586be01 VxWorks: Add Platform ID for Modules/CMakePlatformId.h.in

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4922
 2020-06-23 08:00:31 -04:00
Lihua Zhao b22586be01 VxWorks: Add Platform ID for Modules/CMakePlatformId.h.in 2020-06-23 07:59:32 -04:00
Brad King 22dbe547fb Merge topic 'makefile-fix-verbose' into release-3.18 
7f78bc42cb Makefile: Fix regression in .SILENT rule

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4928
 2020-06-23 07:57:33 -04:00
Brad King 38719f4c95 Merge branch 'release-3.18' 2020-06-23 07:57:33 -04:00
Brad King 63382b5277 Merge topic 'makefile-fix-verbose' 
7f78bc42cb Makefile: Fix regression in .SILENT rule

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4928
 2020-06-23 07:57:33 -04:00
Brad King 069e904337 Merge topic 'fix-win-flex-bison' into release-3.18 
0faa2b9870 Find{FLEX,BISON}: Add 'win-' executable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4931
 2020-06-23 07:56:39 -04:00
Brad King 7ed844df03 Merge branch 'release-3.18' 2020-06-23 07:56:39 -04:00
Brad King 0a337716ce Merge topic 'fix-win-flex-bison' 
0faa2b9870 Find{FLEX,BISON}: Add 'win-' executable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4931
 2020-06-23 07:56:39 -04:00
Brad King afea276621 Merge branch 'release-3.18' 2020-06-23 07:55:41 -04:00
Brad King df69cb37d1 Merge topic 'FindCUDA-11' into release-3.18 
1d9f2f9714 FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4929
 2020-06-23 07:55:40 -04:00
Brad King d80a370e75 Merge topic 'FindCUDA-11' 
1d9f2f9714 FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4929
 2020-06-23 07:55:40 -04:00
Brad King 86cd7d67d3 Merge topic 'test-all-find-modules' into release-3.18 
6c6b227813 Tests: Drop redundant FindModulesExecuteAll test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4930
 2020-06-23 07:53:44 -04:00
Brad King 810a331b0d Merge branch 'release-3.18' 2020-06-23 07:53:44 -04:00
Brad King 8fc9a9f4a0 Merge topic 'test-all-find-modules' 
6c6b227813 Tests: Drop redundant FindModulesExecuteAll test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4930
 2020-06-23 07:53:44 -04:00
Brad King 6c6b227813 Tests: Drop redundant FindModulesExecuteAll test 
This test has been superseded by `CMakeOnly.AllFindModules`,
which does much more checking anyway.
 2020-06-23 07:48:53 -04:00
Kitware Robot ee5893c10e CMake Nightly Date Stamp 2020-06-23 00:02:37 -04:00
Yan 0faa2b9870 Find{FLEX,BISON}: Add 'win-' executable names 
Distributions of these tools on Windows now use a `win-` prefix
instead of the previously-seen `win_` prefix.  Search for both.
 2020-06-22 15:50:22 -04:00
Robert Maynard 1d9f2f9714 FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11 
The nppicom library has been removed in preference of nvjpeg starting
in CUDA 11.

Fixes: #20845
 2020-06-22 11:56:51 -04:00
Robert Maynard 7628153edb Refactor file extension queries to be more consistent 
It was very easy to forgot to check against all language file
extensions. This updates the internal API to have a unified API.
 2020-06-22 09:13:16 -04:00
Daniel Colascione 7f78bc42cb Makefile: Fix regression in .SILENT rule 
Since commit d74e651b78 (Makefiles: Re-implement makefile target path
escaping and quoting, 2020-04-10, v3.18.0-rc1~334^2~1), `WriteMakeRule`
now correctly escapes `$` in make target paths as `$$`.  However, this
caused an existing call site to escape the `$(VERBOSE)` variable
reference in the `.SILENT` prefix, making it ineffective.  Sub-makefiles
are invoked with `MAKESILENT`, so this bug matters only for the `all`
target, which emits progress messages from toplevel.

Before:

    # Suppress display of executed commands.
    $$(VERBOSE).SILENT:

After:

    # Suppress display of executed commands.
    $(VERBOSE).SILENT:
 2020-06-22 08:48:53 -04:00
Robert Maynard c4e890946a try_compile: consistently add language properties 
It was very easy to forgot to add all the possible language
properties that try_compile might need. Refactored the code
to make it harder to skip flags.

This changes adds the missing language properties for
the CUDA, Fortran, OBJC, OBJCXX, and Swift languages:

- CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN
- CMAKE_<LANG>_COMPILER_TARGET
- CMAKE_<LANG>_LINK_NO_PIE_SUPPORTED
- CMAKE_<LANG>_PIE_SUPPORTED
 2020-06-22 08:37:44 -04:00
Kitware Robot 9692931f83 CMake Nightly Date Stamp 2020-06-22 00:02:06 -04:00
Corentin Plouet ee5eb2eab4 Graphviz: add missing support for circular dependencies 
This support was actually added by removing a superfluous check that was
too eager in cmLinkItemGraphVisitor.cxx.

Extended the existing Graphviz tests to include this particular case,
and re-generated the expected output files.

Fixes: #20720
 2020-06-22 01:17:19 +10:00
Kitware Robot 71f6c7badf CMake Nightly Date Stamp 2020-06-21 00:02:53 -04:00
Kitware Robot eae0c0afbb CMake Nightly Date Stamp 2020-06-20 00:02:46 -04:00
Brad King 6f7853cb42 Merge topic 'get_filename_component-error-fatal' 
470b3a76b3 get_filename_component: make errors fatal

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4914
 2020-06-19 08:17:12 -04:00
Brad King c19b5765e1 Merge topic 'FindSDL-update' 
9ffd2c70bf FindSDL: Add SDL_INCLUDE_DIRS, SDL_LIBRARIES, and SDL::SDL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4902
 2020-06-19 08:16:40 -04:00
Brad King d736b2ef3a Merge topic 'test-extra-generators' 
ab6e1e49c0 Tests: Simplify addition of extra generator tests
882483192d cmake: Simplify internal conditions for adding extra generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4909
 2020-06-19 08:15:59 -04:00
Brad King c0b44e664b Merge topic 'try_compile-nfs' into release-3.18 
a9a258c302 try_compile: Do not try to remove '.nfs*' files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Merge-request: !4913
 2020-06-19 08:14:05 -04:00
Brad King 2139987ba4 Merge branch 'release-3.18' 2020-06-19 08:14:05 -04:00
Brad King 43e8db481b Merge topic 'try_compile-nfs' 
a9a258c302 try_compile: Do not try to remove '.nfs*' files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Merge-request: !4913
 2020-06-19 08:14:05 -04:00
Brad King 5c550b796d Merge branch 'release-3.18' 2020-06-19 08:13:09 -04:00
Brad King 21d0961bc2 Merge topic 'CUDAToolkit-cuda-11' into release-3.18 
b284a3c764 CudaToolkit: Update for new/removed libraries in CUDA 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4917
 2020-06-19 08:13:08 -04:00
Brad King 09d46e9bb6 Merge topic 'CUDAToolkit-cuda-11' 
b284a3c764 CudaToolkit: Update for new/removed libraries in CUDA 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4917
 2020-06-19 08:13:08 -04:00
Brad King 4d40bda340 Merge branch 'release-3.18' 2020-06-19 08:12:05 -04:00
Brad King c7561c0fcc Merge topic 'cuda-toolkit-vs' into release-3.18 
a0280801f4 CUDA: Fix CMAKE_CUDA_COMPILER_TOOLKIT_ROOT detection in Visual Studio
90be0916b5 CUDA: Re-order some logic for determining the compiler
4ab5f109f0 CUDA: Remove unused variables while determining compiler
492e5f01fa CUDA: Simplify CMAKE_CUDA_COMPILER_TOOLKIT_ROOT computation
4785bd6153 CUDA: Skip the entire search for nvcc when it is CMAKE_CUDA_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4921
 2020-06-19 08:12:04 -04:00
Brad King 0741c50275 Merge topic 'cuda-toolkit-vs' 
a0280801f4 CUDA: Fix CMAKE_CUDA_COMPILER_TOOLKIT_ROOT detection in Visual Studio
90be0916b5 CUDA: Re-order some logic for determining the compiler
4ab5f109f0 CUDA: Remove unused variables while determining compiler
492e5f01fa CUDA: Simplify CMAKE_CUDA_COMPILER_TOOLKIT_ROOT computation
4785bd6153 CUDA: Skip the entire search for nvcc when it is CMAKE_CUDA_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4921
 2020-06-19 08:12:04 -04:00
Brad King 33e1dc48c7 Merge topic 'cuda_nvcc_exe_search' into release-3.18 
d9c1f05924 CUDA: Fix NVCC executable search during compiler detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4920
 2020-06-19 08:10:33 -04:00
Brad King 3ea1d68534 Merge branch 'release-3.18' 2020-06-19 08:10:33 -04:00
Brad King 7e854614b4 Merge topic 'cuda_nvcc_exe_search' 
d9c1f05924 CUDA: Fix NVCC executable search during compiler detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4920
 2020-06-19 08:10:33 -04:00