mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 04:40:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
51,023 Commits 2 Branches 401 Tags
afd495decdc0d4bca5b0eadebdb8850f8f634be3
Commit Graph

11190 Commits

Author SHA1 Message Date
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
Brad King 46ba79089d Merge topic 'iar-obj-declutter' 
b357f78196 IAR: Use .o object file extension with IAR-Ilink toolchains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5380
 2020-10-16 09:21:19 -04:00
Samir Benmendil bddc54a37d CheckLanguage: Pass CMAKE_TOOLCHAIN_FILE to test project 
Fixes: #20545
 2020-10-16 09:13:32 -04:00
Marc Chevrier 23cd98a66a FindPython: Add support of version 3.10 2020-10-16 11:36:53 +02:00
Felipe Torrezan b357f78196 IAR: Use .o object file extension with IAR-Ilink toolchains 
The compiler default extension for its objects is `.o`.
Prefer that over `.obj`.
 2020-10-15 11:49:39 -04:00
Michael Hirsch 1e519df025 CheckSource{Runs,Compiles}: Fix default Fortran source extension 
In commit 357e2ef429 (CheckSoureRuns: Add a unified way to check if a
source runs, 2020-09-14, v3.19.0-rc1~118^2), the default Fortran source
file extension was accidentally changed from `.F90` to `.F`.  Fix that.

In commit 10ae907de0 (CheckSoureCompiles: Add a unified way to check if
a source compiles, 2020-09-14, v3.19.0-rc1~118^2~1), the default Fortran
source extension was correctly preserved as `.F`, but `.F90` is a better
default both for consistency and modern usage.  Use that for direct
calls to the `check_source_compiles` macro.  Update our original
`check_fortran_source_compiles` implementation to use `.F` by default
as it did before.

Fixes: #21307
 2020-10-15 09:33:59 -04:00
Brad King a258d03e33 Merge topic 'FindIntl_use_imported_targets' 
c30d06b7e6 FindIntl: Add imported target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5333
 2020-10-14 11:44:08 -04:00
Sibi Siddharthan c30d06b7e6 FindIntl: Add imported target 
Fixes: #21271
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-10-13 15:11:40 -04:00
Haibo Huang 8e4aa63c7b Android: show supported API level in error message 2020-10-13 08:40:44 -04:00
Brad King 01ae8149b8 Merge topic 'android-verify-abi-in-ndk' into release-3.19 
5c2f9e3eeb Android: Fatal if ABI is not supported by NDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5351
 2020-10-13 08:38:54 -04:00
Marc Chevrier 5772ca0a53 FindPython: Ensure Apple Xcode python 3 is usable 
The python 3 distributed as part of Xcode requires the specification
of a 'rpath' pointing at frameowrks root for a correct execution.

Fixes: #21293
 2020-10-12 15:45:55 +02:00
Haibo Huang 5c2f9e3eeb Android: Fatal if ABI is not supported by NDK 2020-10-09 09:49:19 -04:00
Brad King 5f2e1f2f3d Merge topic 'GNUInstallDirs-debian' into release-3.19 
798c1c3192 GNUInstallDirs: Comply with Debian Policy on LIBEXECDIR
75bcd3cf54 Tests: Add RunCMake.GNUInstallDirs expected output specific to Debian

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5349
 2020-10-09 09:38:20 -04:00
Brad King ac765f5eff FetchContent: Remove unnecessary policy CMP0114 setting 
Now that `CMAKE_VERSION` is at least 3.19, the policy will be set to NEW
implicitly by the version.
 2020-10-08 11:59:05 -04:00
Dennis Klein 798c1c3192 GNUInstallDirs: Comply with Debian Policy on LIBEXECDIR 
If CMAKE_INSTALL_PREFIX is /usr, CMAKE_INSTALL_LIBEXECDIR shall return
the same value as CMAKE_INSTALL_LIBDIR on Debian.

While the FHS allows /usr/libexec for internal binaries
(https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrlibexec) the
Debian Policy Manual states an exception here (section 9.1.1 bullet point 4):
https://www.debian.org/doc/debian-policy/ch-opersys#file-system-structure.

Fixes: #21287
 2020-10-08 11:10:41 -04:00
Brad King 20d140c894 Merge topic 'android-ndk-r22' 
1ab574a0f4 Android: Add support for NDK r22
91a362d2fa Android: Drop redundant setting of CMP0057 in Android-Determine
0b082c5253 Android: Select Android API after ABI is determined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5332
 2020-10-08 09:23:37 -04:00
Brad King bc19ceb6fe Merge topic 'check_cuda_helpers' 
5c66ac31e6 CUDA: CheckLinkerFlag now supports CUDA
da2622ff36 CUDA: Add Support to SourceCompiles|Runs and CheckCompilerFlags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5338
 2020-10-08 09:22:21 -04:00
Robert Maynard 5c66ac31e6 CUDA: CheckLinkerFlag now supports CUDA 2020-10-08 08:30:59 -04:00
Robert Maynard da2622ff36 CUDA: Add Support to SourceCompiles|Runs and CheckCompilerFlags 2020-10-08 08:30:59 -04:00
Brad King 96dcf07d33 Merge topic 'FindwxWidgets-freebsd' 
1fe5abb47f FindwxWidgets: Expand list of names for wx-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5342
 2020-10-08 08:10:41 -04:00
Brad King 736cd0f533 Merge topic 'FindJNI-freebsd' 
79bfa0f75e FindJNI: Search in FreeBSD standard locations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5341
 2020-10-08 08:09:53 -04:00
Haibo Huang 1ab574a0f4 Android: Add support for NDK r22 
NDK r22 removed platforms and sysroot directory.
NDK r18+ provides `.cmake` files with tables of platforms and abis.
 2020-10-07 16:18:10 -07:00