mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-30 18:29:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
48,829 Commits 2 Branches 385 Tags
ba222d9fb0440c7cad845e2a01bd32fb454cc109
Commit Graph

48829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
ba222d9fb0 Merge topic 'GoogleTest-DISCOVERY_MODE-cleanups' 
1458b4c048 Help: Add CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE to release notes
642ea49115 GoogleTest: Replace SEND_ERROR with FATAL_ERROR
09c38e8de6 Tests: Don't ask for things not required for GoogleTest

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4938
 2020-06-26 09:31:20 -04:00
Brad King
5c7ce56bce Merge branch 'release-3.18' 2020-06-26 09:30:26 -04:00
Brad King
ac4ac03597 Merge topic 'update-curl' 
e5ff413f41 curl: Set build options the way we need for CMake
0ef8fa5000 Merge branch 'upstream-curl' into update-curl
5717fdc114 curl 2020-06-23 (e9db32a0)
39f7cfad31 curl: Update script to get curl 7.71.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4937
 2020-06-26 09:30:25 -04:00
Brad King
42d9b3dc6a Merge topic 'update-curl' into release-3.18 
e5ff413f41 curl: Set build options the way we need for CMake
0ef8fa5000 Merge branch 'upstream-curl' into update-curl
5717fdc114 curl 2020-06-23 (e9db32a0)
39f7cfad31 curl: Update script to get curl 7.71.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4937
 2020-06-26 09:30:25 -04:00
Kitware Robot
035a3940f5 CMake Nightly Date Stamp 2020-06-26 05:51:02 -04:00
Kitware Robot
aae35feea2 CMake Nightly Date Stamp 2020-06-25 00:02:04 -04:00
Craig Scott
1458b4c048 Help: Add CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE to release notes 2020-06-24 23:19:06 +10:00
Brad King
e5ff413f41 curl: Set build options the way we need for CMake 2020-06-24 08:23:52 -04:00
Brad King
0ef8fa5000 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-06-23 (e9db32a0)
 2020-06-24 08:13:02 -04:00
Craig Scott
642ea49115 GoogleTest: Replace SEND_ERROR with FATAL_ERROR 
We want to fail and halt immediately upon any error, not continue
past a fatal problem.
 2020-06-24 21:57:19 +10:00
Craig Scott
09c38e8de6 Tests: Don't ask for things not required for GoogleTest 
The test cases only need C or C++, but not both. The CTest module
is also not needed because we are not running a dashboard script.
 2020-06-24 21:56:26 +10:00
Curl Upstream
5717fdc114 curl 2020-06-23 (e9db32a0) 
Code extracted from:

    https://github.com/curl/curl.git

at commit e9db32a09af03f27e86d1251a9e68e9b7486d371 (curl-7_71_0).
 2020-06-24 07:55:09 -04:00
Brad King
39f7cfad31 curl: Update script to get curl 7.71.0 2020-06-24 07:54:53 -04:00
Brad King
9c73be33a0 Merge topic 'mkl-win32' 
56e645a4c3 Find{BLAS,LAPACK}: Add missing thread library for Intel MKL on Win32

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4936
 2020-06-24 07:03:00 -04:00
Kitware Robot
bb2d9a02be CMake Nightly Date Stamp 2020-06-24 00:02:09 -04:00
evatux
56e645a4c3 Find{BLAS,LAPACK}: Add missing thread library for Intel MKL on Win32 
The patch also updates the documentation to explicitly state
that Intel10_32 stands for threaded case (linked with Intel OpenMP).
Later, one may need to add Intel10_32_seq to support linking
with the sequential version of Intel MKL.

Fixes: #20857
 2020-06-23 09:16:14 -07:00
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
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
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
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