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

10999 Commits

Author SHA1 Message Date
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
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
Haibo Huang 91a362d2fa Android: Drop redundant setting of CMP0057 in Android-Determine 
A module-wide setting was added by commit 8ede35523e (IN_LIST: Ensure
policy allows if(IN_LIST) if used by a module, 2018-09-12,
v3.13.0-rc1~95^2), so our local setting is no longer needed.
 2020-10-07 16:17:36 -07:00
Haibo Huang 0b082c5253 Android: Select Android API after ABI is determined 
API level depends on ABI. E.g. for LP64 the minimum API level should be 21 instead of 16 for others.
 2020-10-07 16:13:56 -07:00
Adriaan de Groot 79bfa0f75e FindJNI: Search in FreeBSD standard locations 2020-10-07 10:12:49 -04:00
Adriaan de Groot 1fe5abb47f FindwxWidgets: Expand list of names for wx-config 
This looks for the FreeBSD-packaging names of wx-config as well.

Fixes: #19372
 2020-10-07 10:11:18 -04:00
Brad King c61f820a7f Merge topic 'add_ispc_to_check_helpers' 
e17e2c6a51 ISPC: CheckCompilerFlags and CheckSourceCompiles support ISPC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5337
 2020-10-07 07:13:21 -04:00
Robert Maynard e17e2c6a51 ISPC: CheckCompilerFlags and CheckSourceCompiles support ISPC 2020-10-06 10:47:20 -04:00
Luthaf d66858c8e4 CheckCompilerFlag: Update the regex used to detect invalid options for GCC 10 
The warning emmitted by GCC for invalid options have been updated to
read "command-line option XXX is valid ..." instead of "command line
option XXX is valid ...".  Update the regex to make it valid with both
the old and new warning message.

Fixes: #21275
 2020-10-06 10:38:18 -04:00
Brad King 691cff7c01 Merge topic 'boost-1.74.0' 
0d86bb0902 FindBoost: Add 1.74 to known versions
1940e24d58 FindBoost: Prevent warning with boost 1.74

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5319
 2020-10-06 06:49:59 -04:00
Brad King d25c38374c Merge topic 'cuda_nvcc_abi_werror' 
079ea66468 CMakeDetermineCompilerABI: Handle NVCC-style -Werror flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Seth R Johnson <johnsonsr@ornl.gov>
Merge-request: !5318
 2020-10-05 08:54:50 -04:00
Craig Scott a771e2146a Merge topic 'FetchContent_missing_SOURCE_DIR' 
b030a6af88 FetchContent: Raise error if manually given source dir does not exist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5317
 2020-10-04 17:02:11 -04:00
Olivier LIESS 0d86bb0902 FindBoost: Add 1.74 to known versions 2020-10-04 22:07:45 +02:00
Olivier LIESS 1940e24d58 FindBoost: Prevent warning with boost 1.74 2020-10-04 22:05:47 +02:00
Raul Tambre 079ea66468 CMakeDetermineCompilerABI: Handle NVCC-style -Werror flags 
NVCC doesn't require an equals sign for its -Werror flags.

Fixes #21265.
 2020-10-04 09:09:21 +03:00
Craig Scott b030a6af88 FetchContent: Raise error if manually given source dir does not exist 
Fixes: #21208
 2020-10-03 18:46:08 +10:00
Marc Chevrier 127436192d FindSWIG: Fix syntax error 
Add some tests to cover all cases regarding version handling

Fixes: #21264
 2020-10-02 16:17:36 +02:00
Brad King 3ec0f9d620 Merge topic 'UseSWIG-output-source-file-properties' 
4a81a0ce3d UseSWIG: Add OUTPUT_DIR and OUTFILE_DIR source file properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5303
 2020-10-02 09:55:26 -04:00
Craig Scott 468bcc3291 Merge topic 'FindSWIG-version-range' 
1d300ee2a9 FindSWIG: Add version range support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5306
 2020-10-02 06:58:13 -04:00
Brad King 2e8b85b040 Merge topic 'macos-arm64' 
b6c60f14b6 macOS: Default to arm64 architecture on Apple Silicon hosts
383e81aa60 Tests: Teach RunCMake to ignore Xcode internal objc warnings
8f75912176 Tests: Enable Assembler test case when CMAKE_OSX_ARCHITECTURES has one value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5291
 2020-10-01 08:45:13 -04:00
Brad King 9fc742041b Merge topic 'intel-clang' 
5c3a93ab88 Intel: Add Intel Clang compiler identification

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5300
 2020-10-01 07:55:13 -04:00
Marc Chevrier 1d300ee2a9 FindSWIG: Add version range support 2020-10-01 12:00:29 +02:00
Marc Chevrier 4a81a0ce3d UseSWIG: Add OUTPUT_DIR and OUTFILE_DIR source file properties 
These properties enable to manage output directories on
per source file basis.

Fixes: #21250
 2020-09-30 19:19:14 +02:00
Brad King b6c60f14b6 macOS: Default to arm64 architecture on Apple Silicon hosts 
Detect `arm64` hardware using a method that pierces Rosetta.  If
`CMAKE_OSX_ARCHITECTURES` is not set, pass explicit flags to the
toolchain to use `arm64` instead of letting the toolchain pick.

Fixes: #20989
 2020-09-30 11:58:44 -04:00
Marc Chevrier e4b7049230 FindPython: Add version range support 
Fixes: #21107
 2020-09-30 14:30:23 +02:00
Craig Scott f002c1cfc7 Merge topic 'find-package-check-empty-version-range' 
212b0afb66 find_package: raise error on empty version range

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5294
 2020-09-30 08:22:49 -04:00
Brad King 676571afe0 Merge topic 'cxx-as-objcxx' 
8a2977ba55 OBJCXX: Fix regression for compiling cpp files as objcxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5296
 2020-09-30 08:06:57 -04:00
Brad King 21b6b13956 Merge topic 'cuda-11.1-sm86' 
5f6b0ba8b1 FindCUDA/select_compute_arch: Add CUDA 11.1 and SM86 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5292
 2020-09-30 08:05:50 -04:00
Harini Chilamantula 5c3a93ab88 Intel: Add Intel Clang compiler identification 
The compiler identifies itself with the `__INTEL_CLANG_COMPILER`
preprocessor definition.
 2020-09-29 17:00:43 -04:00
Cristian Adam 8a2977ba55 OBJCXX: Fix regression for compiling cpp files as objcxx 
In commit 8d61294c3e (PCH: Mark CMake PCH source files as -x
<lang>-header, 2020-09-04, v3.18.3~14^2) we removed the explicit `-x
objective-c++` flag.  This broke cases with custom source extensions.

Restore the explicit `-x objective-c[++]` flag and put it before the
`<FLAGS>` placeholder.  The latter will contain the proper `-x
objective-c[++]-header` value and will override the `-x objective-c[++]`
value set before.

Fixes: #21234
 2020-09-29 12:35:49 -04:00
Marc Chevrier 212b0afb66 find_package: raise error on empty version range 2020-09-29 13:06:09 +02:00
Brad King 0021d24fb3 Merge topic 'add_lang_agnostic_check_compile_flag_module' 
90dead024c CheckCompilerFlag: unified way to check compiler flags per language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5281
 2020-09-29 05:45:07 -04:00
zasdfg bnm 5f6b0ba8b1 FindCUDA/select_compute_arch: Add CUDA 11.1 and SM86 support 2020-09-29 05:32:25 -04:00
Robert Maynard 90dead024c CheckCompilerFlag: unified way to check compiler flags per language 2020-09-28 09:07:54 -04:00
Brad King 20bd9c2674 Merge topic 'vs-generator-platform-install-prefix' 
561d4b4a47 VS: Fix CMAKE_INSTALL_PREFIX with GENERATOR_PLATFORM for x64 and ARM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5272
 2020-09-28 08:44:48 -04:00
Brad King 9e0da9ea2b Merge topic 'pkg_config_detailed_error' 
ab8bd48352 FindPkgConfig: Search for pkg-config.bat file on a Windows host
3201dd521e FindPkgConfig: Show more info when pkg-config --version fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5273
 2020-09-28 08:44:09 -04:00
Brad King 7fcd5d75f2 Merge topic 'FPHSA-fix-spurious-error' 
1e82b1c4bc FPHSA: avoid spurious error if version variable is not defined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5277
 2020-09-28 08:41:02 -04:00
Brad King 99f92d55d6 Merge topic 'FindJNI-aarch64' into release-3.18 
696d16ae6c FindJNI: Add aarch64 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vitaly Lipatov <lav@etersoft.ru>
Merge-request: !5275
 2020-09-28 08:38:54 -04:00
Brad King c47293fe9f Merge topic 'FindJNI-aarch64' 
696d16ae6c FindJNI: Add aarch64 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vitaly Lipatov <lav@etersoft.ru>
Merge-request: !5275
 2020-09-28 08:38:54 -04:00
Marc Chevrier 1e82b1c4bc FPHSA: avoid spurious error if version variable is not defined 
Fixes: #21241
 2020-09-25 19:35:11 +02:00
Rechi 561d4b4a47 VS: Fix CMAKE_INSTALL_PREFIX with GENERATOR_PLATFORM for x64 and ARM 
Generate the same default `CMAKE_INSTALL_PREFIX` if a project is
configured with CMAKE_GENERATOR_PLATFORM (`cmake -G "Visual Studio
[...]" -A x64` and `cmake -G "Visual Studio [...]" -A ARM`) instead of
the prior CMake 3.1 way (`cmake -G "Visual Studio [...] Win64"` and
`cmake -G "Visual Studio [...] ARM"`).
 2020-09-25 13:11:14 -04:00