mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 22:31:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,603 Commits 2 Branches 401 Tags
d720cd847e332f1fe700eb77ad597bfc5e9f0223
Commit Graph

11061 Commits

Author SHA1 Message Date
Craig Scott 73974d84c2 Merge topic 'abi-byte-order' 
f511a1c009 CMakeDetermineCompilerABI: Detect byte order as part of check
606b34b3a6 CMakeDetermineCompilerABI: Look for more INFO strings in test binary

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Juan Ramos <juan.ramos@amd.com>
Acked-by: John Palmer <juanr0911@gmail.com>
Merge-request: !5460
 2020-11-05 07:47:59 -05:00
Brad King f511a1c009 CMakeDetermineCompilerABI: Detect byte order as part of check 
We already detect `sizeof(void*)`.  Detect the byte order as part of the
same check.

Issue: #21392
 2020-11-04 10:08:13 -05:00
Brad King 606b34b3a6 CMakeDetermineCompilerABI: Look for more INFO strings in test binary 
Explicitly use only the first occurrence of each matched INFO string
since previously we only extracted the first two anyway.
 2020-11-04 09:45:28 -05:00
Marc Chevrier e452f6e2cf FindPython: Adds control over artifact names to search 
Fixes: #21371
 2020-11-03 15:12:58 +01:00
Brad King 622ac065d2 Merge topic '19128_ICU_case_consistency' 
ec23338187 FindICU: Improve case consistency in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5452
 2020-11-03 07:32:20 -05:00
Brad King 23d379674b Merge topic 'android-hooks' 
707a06761f Android: add NDK hooks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5436
 2020-11-03 07:27:13 -05:00
Brad King e8adc3654a Merge topic 'fix-cuda-qnx' 
0832516bec Help: Add 3.19 release note about CUDA support on QNX
bcdd486bf7 CUDA: Enable support on QNX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5446
 2020-11-03 07:22:55 -05:00
Craig Scott a18903a655 Merge topic 'doc-cpack-pre-post-scripts' 
b77dfa441f Help: Clarify variables specifying scripts to execute during packaging

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !5454
 2020-11-03 04:21:15 -05:00
Craig Scott b77dfa441f Help: Clarify variables specifying scripts to execute during packaging 
Relates: #19077
 2020-11-03 20:11:38 +11:00
Brad King fa60d56c87 Merge topic 'FindBoost-config-mode' 
685fa8bec0 FindBoost: Avoid leaking internal Boost_ROOT setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5445
 2020-11-02 09:43:33 -05:00
janbernloehr bcdd486bf7 CUDA: Enable support on QNX 
This fixes the following two issues with the CUDA support on QNX:

* cuda target name is not derived correctly (should be `aarch64-qnx`).
* linking `cudart` must not be linked against `rt`, `dl`, `pthread`.

This enables to use cmake's native cuda support on QNX.

Fixes: #21381
 2020-11-02 09:39:36 -05:00
Roger Leigh ec23338187 FindICU: Improve case consistency in documentation 2020-10-31 12:13:30 +00:00
Brad King 013c4133f7 Merge topic 'CheckSourceRuns-compatibility' into release-3.19 
a524bf3aa7 CheckSourceRuns: do not fail on unrecognized arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5426
 2020-10-30 09:51:35 -04:00
Brad King 301d82a6ae Merge topic 'CheckSourceRuns-compatibility' 
a524bf3aa7 CheckSourceRuns: do not fail on unrecognized arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5426
 2020-10-30 09:51:35 -04:00
Brad King 685fa8bec0 FindBoost: Avoid leaking internal Boost_ROOT setting 
Since commit 4b2a61946f (FindBoost: Honor BOOST_ROOT when finding
upstream BoostConfig, 2020-10-22, v3.19.0-rc2~14^2) we accidentally leak
our internal setting of `Boost_ROOT`.  Revise the logic to unset our
temporary value.

Fixes: #21379
 2020-10-30 09:42:43 -04:00
Haibo Huang 707a06761f Android: add NDK hooks 
This change adds hooks to key Android support files, so that NDK can
inject information or change cmake behaviors.
 2020-10-29 17:52:41 -07:00
Brad King 32d369aa70 Merge topic 'llvm-rc-CMAKE_RC_FLAGS' 
ea03f50842 llvm_rc: add llvm_rc option filter to correctly pick up all options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5412
 2020-10-29 10:14:20 -04:00
Ben Boeckel a524bf3aa7 CheckSourceRuns: do not fail on unrecognized arguments 
The old `check_X_source_runs` modules did not verify the arguments, so
we cannot start doing it now. Downgrade the hard error introduced in
commit 357e2ef429 (CheckSoureRuns: Add a unified way to check if a
source runs, 2020-09-14) via !5223 into a noisy warning.
 2020-10-28 15:06:02 -04:00
Brad King e596b0e68e Merge topic 'FindRuby-restore-VENDORLIB_DIR' 
80e693152c Merge branch 'release-3.19' into FindRuby-restore-VENDORLIB_DIR
4c0ef57e8c FindRuby: Restore compatibility variable RUBY_VENDORLIB_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5434
 2020-10-28 07:27:49 -04:00
Thomas Bernard ea03f50842 llvm_rc: add llvm_rc option filter to correctly pick up all options 
Fixes: #21315
 2020-10-28 07:19:31 -04:00
Brad King 80e693152c Merge branch 'release-3.19' into FindRuby-restore-VENDORLIB_DIR 2020-10-27 12:25:41 -04:00
Brad King 4c0ef57e8c FindRuby: Restore compatibility variable RUBY_VENDORLIB_DIR 
Since commit e672db628b (FindRuby: Rename variables to match case of
module name, 2020-03-11, v3.18.0-rc1~546^2), the result variables named
with the old `RUBY_` prefix are provided by compatibility code that maps
from the new `Ruby_` prefix variables.  This variable was accidentally
left out.

Fixes: #21369
 2020-10-27 12:18:05 -04:00
Brad King 96ea613f16 Merge topic 'correct_msvc_cuda_flag_warning' into release-3.19 
2b0d3c3524 CUDA: Use MSVC version to determine supported C++ standard levels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5423
 2020-10-27 07:05:18 -04:00
Brad King 6739e8560c Merge topic 'correct_msvc_cuda_flag_warning' 
2b0d3c3524 CUDA: Use MSVC version to determine supported C++ standard levels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5423
 2020-10-27 07:05:18 -04:00
Brad King 967fb42d47 Merge topic 'check-module-name-conflicts' 
d192918586 Modules: Do not implicitly add new functions via old Check Modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5424
 2020-10-27 07:02:50 -04:00
Robert Maynard 2b0d3c3524 CUDA: Use MSVC version to determine supported C++ standard levels 
Fixes: #21335
 2020-10-26 11:36:55 -04:00
Robert Maynard d192918586 Modules: Do not implicitly add new functions via old Check Modules 
The conversion of Check<Lang>CompilerFlag, SourceCompiles, and
SourceRuns over to the new functions has the possibility of breaking
projects that had functions with those existing names.

To reduce the possibility of collisions we now have all the
legacy code call functions that start with `cmake_`, and users
will need to explicitly include the new modules to get the
non-prefixed versions

Fixes: #21359
 2020-10-26 10:57:55 -04:00
Brad King d67f47109c Merge topic 'ExternalData-suppress-progress' 
ae7c81c622 ExternalData: add support for suppressing progress during the build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5413
 2020-10-26 10:31:11 -04:00
Brad King 223eb0226e Merge topic 'android-find_path' 
a7f41a7ee4 Android: Fix find_* search order within NDK for unified toolchains
5cdf37e4cc Android: Root searches within the NDK for unified toolchains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5357
 2020-10-26 10:30:12 -04:00
Brad King 6335b67c80 Merge topic 'FindBoost-config-mode' into release-3.19 
4b2a61946f FindBoost: Honor BOOST_ROOT when finding upstream BoostConfig
b32cb33275 FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfig

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5408
 2020-10-26 10:27:25 -04:00
Brad King 9a01da2cfb Merge topic 'FindBoost-config-mode' 
4b2a61946f FindBoost: Honor BOOST_ROOT when finding upstream BoostConfig
b32cb33275 FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfig

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5408
 2020-10-26 10:27:25 -04:00
Craig Scott 394a5b71b0 Merge topic 'docs-cleanup-3.19' 
95c14579f2 Help: Cleanup typos and grammar for the 3.19 release

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5419
 2020-10-26 07:16:03 -04:00
Craig Scott 95c14579f2 Help: Cleanup typos and grammar for the 3.19 release 2020-10-24 22:58:42 +11:00
Ben Boeckel ae7c81c622 ExternalData: add support for suppressing progress during the build 
During CI builds (at least), download progress is just noise. Allow it
to be suppressed.

Default to `OFF` for Ninja due to the tool's behavior of not showing
output until a command is complete (which makes any progress reporting
of little use) and `ON` otherwise.
 2020-10-23 09:49:51 -04:00
Haibo Huang a7f41a7ee4 Android: Fix find_* search order within NDK for unified toolchains 2020-10-23 09:36:48 -04:00
Haibo Huang 5cdf37e4cc Android: Root searches within the NDK for unified toolchains 
Set `CMAKE_FIND_ROOT_PATH_MODE_*` appropriately.
 2020-10-23 09:36:40 -04:00
Brad King b91dd2c639 Merge topic 'ctest-hostname-cleanup' 
11d21c1c4e CTest: Avoid invoking external tool to get the host name
3f3762856f Tests: Add case verifying CTest module SITE variable
94c6295db1 Help: Document site_name command use of HOSTNAME variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5407
 2020-10-23 09:02:37 -04:00
Brad King 11d21c1c4e CTest: Avoid invoking external tool to get the host name 
Populate the SITE cache entry using an internal query instead.
 2020-10-22 10:49:17 -04:00
Brad King 4b2a61946f FindBoost: Honor BOOST_ROOT when finding upstream BoostConfig 
Fixes: #21200
 2020-10-22 10:42:33 -04:00
Brad King b32cb33275 FindBoost: Honor Boost_NO_SYSTEM_PATHS when finding upstream BoostConfig 
Issue: #21200
 2020-10-22 10:42:33 -04:00
Mario Emmenlauer 2327b4330c FindGTest: Added support for CONFIG mode 
Upstream GTest provides its own CMake package files.  Use them if
available.

Fixes: #18801
 2020-10-22 09:32:36 -04:00
Mario Emmenlauer 6d45f951ed FindGTest: Minor whitespace change, moved an include upwards 2020-10-22 09:32:23 -04:00
Mario Emmenlauer 98d5f033ed FindGTest: Ensure target names follow upstream GTest 2020-10-22 09:32:19 -04:00
Brad King 30d2d34611 Merge topic 'nsis-utf-8-bom' 
c92b96234a CPack/NSIS: Template file in UTF-8 BOM to support Unicode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5392
 2020-10-20 09:39:15 -04:00
Johnny Jazeix c92b96234a CPack/NSIS: Template file in UTF-8 BOM to support Unicode 
Fixes: #21318
 2020-10-19 19:53:56 +02:00
Brad King c05e561474 Merge topic 'checklanguage-honor-toolchain' 
bddc54a37d CheckLanguage: Pass CMAKE_TOOLCHAIN_FILE to test project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5384
 2020-10-19 10:28:58 -04:00
Brad King e61d872839 Merge topic 'FindPython-support-version-3.10' into release-3.19 
23cd98a66a FindPython: Add support of version 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5383
 2020-10-19 10:28:00 -04:00
Brad King 9bda28c7a6 Merge topic 'FindPython-support-version-3.10' 
23cd98a66a FindPython: Add support of version 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5383
 2020-10-19 10:28:00 -04:00
Brad King 0bdaa60e43 Merge topic 'CheckSource-Fortran' into release-3.19 
c4c636cef5 Tests: Add cases for CheckSource{Compiles,Runs} bad arguments
1e519df025 CheckSource{Runs,Compiles}: Fix default Fortran source extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5378
 2020-10-16 09:22:32 -04:00
Brad King ce11bace37 Merge topic 'CheckSource-Fortran' 
c4c636cef5 Tests: Add cases for CheckSource{Compiles,Runs} bad arguments
1e519df025 CheckSource{Runs,Compiles}: Fix default Fortran source extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5378
 2020-10-16 09:22:32 -04:00