mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-26 00:20:06 -06:00
Code Issues Packages Projects Releases Wiki Activity
49,077 Commits 2 Branches 386 Tags
0ff06b1c44eef70bb8c74d9c8dff23a464defee3
Commit Graph

10717 Commits

Author SHA1 Message Date
Brad King
2cc5f76701 Merge topic 'irsl-intel-ia32' 
f332ce12d6 IRSL: Fix path to Intel 32-bit redist libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4995
 2020-07-10 06:43:58 -04:00
Brad King
c2f6988ec1 Merge topic 'FindOpenMP-version' 
656d6ea821 FindOpenMP: Set version variables every time CMake runs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4996
 2020-07-10 06:42:43 -04:00
Brad King
13b5588a86 Merge topic 'FindMatlab-unknown-version' 
a3c389cb17 FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4986
 2020-07-09 06:52:01 -04:00
Brad King
ed9b60e89e Merge topic 'cpack2' 
ca9bd43f2d Help: Duplicate essential information on install paths in CPack.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4987
 2020-07-09 06:51:01 -04:00
Brad King
395ba3eb17 Merge topic 'FindJava-no-macos-stub' 
e8051b1f20 FindJava: Update check to avoid accepting macOS stub 'java' as Java

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4993
 2020-07-09 06:49:22 -04:00
Brad King
9165c839f8 Merge topic 'cuda-11-ptx-arch' 
8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4991
 2020-07-09 06:47:43 -04:00
Brad King
10a5ba8dd8 Merge topic 'doc-CPack-source-package' 
f8b7acaf90 Help: Fix CPack module docs on config file for source package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4985
 2020-07-09 06:46:41 -04:00
Torgeir Rusten
f332ce12d6 IRSL: Fix path to Intel 32-bit redist libraries 
The path to the 32 bit libraries in the Intel windows/redist folder use
ia32.  I don't remember if this has changed at some point, but ia32 has
been used at least since Intel Fortran XE 2018.
 2020-07-09 06:29:40 -04:00
Brad King
656d6ea821 FindOpenMP: Set version variables every time CMake runs 
The version is determined in two steps.  First, the "spec date" is
detected and cached.  Second, the date is converted to a version.
Move the second step out of the spec date cache guard condition
so that it runs every time even if the spec date is already cached.

Fixes: #19150
 2020-07-09 06:17:44 -04:00
Brad King
e8051b1f20 FindJava: Update check to avoid accepting macOS stub 'java' as Java 
Since commit dd378258f1 (FindJava: Do not accept OS X stub 'java' as
Java, 2014-10-24, v3.1.0-rc3~29^2) we try to avoid using the macOS
`/usr/bin/java` stub if no underlying implementation of Java is actually
installed.  However, the message that `/usr/bin/java` prints when there
is no Java available has changed since then.  Update our check to also
look for the new message.

While at it, revise the way we suppress `Java_JAVA_EXECUTABLE`.
Previously we set its cache entry to `Java_JAVA_EXECUTABLE-NOTFOUND`,
but that would cause the same find-and-reject sequence to be followed
every time CMake runs in a build tree.  Instead, use the approach from
commit 2c0db404d1 (FindSubversion: Do not accept macOS stub without
Xcode implementation, 2020-05-28, v3.18.0-rc1~67^2).  Leave the cache
entry alone and just set a normal variable of the same name to hide it.
 2020-07-08 16:17:40 -04:00
zasdfg bnm
8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture 2020-07-08 13:35:12 -04:00
Joachim Wuttke (h)
ca9bd43f2d Help: Duplicate essential information on install paths in CPack. 2020-07-08 14:59:01 +02:00
Alexey Kreschuk
a3c389cb17 FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown version 
An "unknown" version does not always mean an old version.  Setting this
macro by mistake does not result in a compilation error, but not setting
it does.  I had this error when compiling from a user that does not have
a matlab license.
 2020-07-08 08:56:10 -04:00
Joachim Wuttke (h)
f8b7acaf90 Help: Fix CPack module docs on config file for source package 2020-07-08 08:36:00 -04:00
Brad King
8cbd338217 Merge topic 'FindMPI-nvcc-link-pthread' 
33192e1b5f FindMPI: Pass -pthread to NVCC through -Xlinker for device linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4981
 2020-07-08 08:26:43 -04:00
Brad King
bc185531fa Merge topic 'cuda-11-compute-arch' into release-3.18 
295d1b9cb5 FindCUDA/select_compute_arch: Add CUDA 11 and Ampere support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Acked-by: Tobias Ribizel <ribizel@kit.edu>
Acked-by: Henry Schreiner <henryschreineriii@gmail.com>
Merge-request: !4979
 2020-07-08 08:25:00 -04:00
Brad King
bb451aadab Merge topic 'cuda-11-compute-arch' 
295d1b9cb5 FindCUDA/select_compute_arch: Add CUDA 11 and Ampere support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Acked-by: Tobias Ribizel <ribizel@kit.edu>
Acked-by: Henry Schreiner <henryschreineriii@gmail.com>
Merge-request: !4979
 2020-07-08 08:25:00 -04:00
Brad King
32e833d5cf Merge topic 'find-blas-lapack-mklroot-win' into release-3.18 
196f042b58 FindLAPACK: Handle Windows Intel MKLROOT with backslash
96c19ecd55 FindBLAS: Handle Windows Intel MKLROOT with backslash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4982
 2020-07-08 08:23:31 -04:00
Brad King
8a3a1cf71a Merge topic 'find-blas-lapack-mklroot-win' 
196f042b58 FindLAPACK: Handle Windows Intel MKLROOT with backslash
96c19ecd55 FindBLAS: Handle Windows Intel MKLROOT with backslash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4982
 2020-07-08 08:23:31 -04:00
zasdfg bnm
295d1b9cb5 FindCUDA/select_compute_arch: Add CUDA 11 and Ampere support 
Co-Author: Henry Schreiner <henryschreineriii@gmail.com>
 2020-07-07 11:32:45 -04:00
Robert Maynard
33192e1b5f FindMPI: Pass -pthread to NVCC through -Xlinker for device linking 
Fixes: #20924
 2020-07-07 10:23:11 -04:00
Michael Hirsch
196f042b58 FindLAPACK: Handle Windows Intel MKLROOT with backslash 2020-07-07 09:55:29 -04:00
Michael Hirsch
96c19ecd55 FindBLAS: Handle Windows Intel MKLROOT with backslash 2020-07-07 09:55:29 -04:00
Brad King
ee781ac59d Merge topic 'doc-versionadded' 
496ec6036f Help: Add Sphinx 'versionadded' directives to each top-level document
0c87afceab Help/dev: Add maintainer guide step for 'versionadded' documentation markup
dbd453c2ff Utilities/Sphinx: Add script for inserting ".. versionadded" directive

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !4947
 2020-07-07 09:22:28 -04:00
Brad King
996b312825 Merge topic 'FindMPI-nvcc-fexceptions' into release-3.18 
b725a19072 FindMPI: Deny -fexceptions from NVCC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4970
 2020-07-07 09:13:49 -04:00
Brad King
096093356c Merge topic 'FindMPI-nvcc-fexceptions' 
b725a19072 FindMPI: Deny -fexceptions from NVCC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4970
 2020-07-07 09:13:49 -04:00
Kitware Robot
496ec6036f Help: Add Sphinx 'versionadded' directives to each top-level document 
Run the `Utilities/Sphinx/update_versions.py` script to add initial
markup to every top-level document and find module.

Issue: #19715
 2020-07-06 10:23:20 -04:00
Axel Huebl
b725a19072 FindMPI: Deny -fexceptions from NVCC 
Do not forward -fexceptions (set from MVAPICH2) to NVCC.

Fixes: #18558
 2020-07-06 09:37:11 -04:00
Brad King
6b246f9198 Merge topic 'darwin-init-var-cleanup' 
2af6857562 Darwin: prefix internal osx variables with "_" to hide them from users

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4967
 2020-07-03 07:34:11 -04:00
Chuck Cranor
2af6857562 Darwin: prefix internal osx variables with "_" to hide them from users 
A simple CMakeLists.txt on osx shows that variable "d" is set
(but empty) by the system modules.  this pollutes the user's
variable namespace.  I noticed this when I created a library
target "d" and got unexpected policy CMP0054 warnings when
trying to find_package(d CONFIG REQUIRED) (triggered from the
generated "d-targets.cmake" ...).   Note that non-"_" prefixed
internal variables are ok within functions due to scoping rules.

Fixes: #20898
 2020-07-03 07:33:25 -04:00
Brad King
476b6be497 Merge topic 'find-libraries-NAMES_PER_DIR' 
0d9d8dd054 FindPNG use NAMES_PER_DIR
e6908b65b4 FindGIF use NAMES_PER_DIR
45ea7f9c80 FindGLEW use NAMES_PER_DIR
8e671f2564 FindLAPACK use NAMES_PER_DIR
ec6bbfd58d FindIntl use NAMES_PER_DIR
667a229e8d FindProtobuf use NAMES_PER_DIR
64d37b4953 FindLibLZMA use NAMES_PER_DIR
9d2c119ff5 FindJPEG use NAMES_PER_DIR
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4961
 2020-07-03 07:27:44 -04:00
Brad King
b516ada836 Merge topic 'FindGTest-no_release_support' 
a064b18f85 FindGTest: Allow either "Debug" or "Release" configurations.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4950
 2020-07-02 08:37:51 -04:00
Brad King
ba889a0b28 Merge topic 'FindLua-5.4' 
bbb7f0e271 FindLua: Add support for Lua 5.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4959
 2020-07-02 08:34:27 -04:00
Sibi Siddharthan
0d9d8dd054 FindPNG use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:44:08 +05:30
Sibi Siddharthan
e6908b65b4 FindGIF use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:43:40 +05:30
Sibi Siddharthan
45ea7f9c80 FindGLEW use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:43:04 +05:30
Sibi Siddharthan
8e671f2564 FindLAPACK use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:42:24 +05:30
Sibi Siddharthan
ec6bbfd58d FindIntl use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:42:02 +05:30
Sibi Siddharthan
667a229e8d FindProtobuf use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:41:17 +05:30
Sibi Siddharthan
64d37b4953 FindLibLZMA use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:40:36 +05:30
Sibi Siddharthan
9d2c119ff5 FindJPEG use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:40:09 +05:30
Sibi Siddharthan
a2a1d5a038 FindIconv use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:39:12 +05:30
Sibi Siddharthan
943bdc7fbd FindEXPAT use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:38:40 +05:30
Sibi Siddharthan
6c77c61532 FindCURL use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:38:11 +05:30
Sibi Siddharthan
739278e971 FindBZip2 use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:37:34 +05:30
Sibi Siddharthan
764696dcd0 FindBLAS use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:37:04 +05:30
Sibi Siddharthan
903a65ce0d FindArmadillo use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:36:14 +05:30
Felix Yan
bbb7f0e271 FindLua: Add support for Lua 5.4 2020-07-01 10:55:32 -04:00
Brad King
57ea001247 Merge topic 'FindTIFF-tiffxx' 
a468cc431c FindTIFF: add component CXX to include the C++ wrapper libtiffxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4934
 2020-07-01 07:02:09 -04:00
William Reid Paape
a064b18f85 FindGTest: Allow either "Debug" or "Release" configurations. 
Call select_library_configurations on GTest library variable basenames "GTEST"
and "GTEST_MAIN" before passing ${basename}_LIBRARY variables to
find_package_handle_standard_args.  This allows either _DEBUG or _RELEASE
library variants to be found for find_package() to pass, whereas the original
version would require the presence of _RELEASE variants.

Fixes: #17799
 2020-06-30 18:31:19 -05:00