mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
49,056 Commits 2 Branches 385 Tags
6a68765a4daa4f2c8cd169bbca12803b0188db09
Commit Graph

49056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
6a68765a4d Merge topic 'doc-source-prop-dir-options' 
0bdb1a77d1 Help: Clarify wording of dir-related source property options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5000
 2020-07-13 07:52:01 -04:00
Brad King
14676e2907 Merge branch 'release-3.18' 2020-07-13 07:49:47 -04:00
Brad King
5899e849d0 Merge topic 'supported-profiling-formats' 
9c3beb532f cmake: Show supported formats in --help output for --profiling-format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: dublet <github@dublet.org>
Merge-request: !5001
 2020-07-13 07:49:47 -04:00
Brad King
aedc5e19f3 Merge topic 'supported-profiling-formats' into release-3.18 
9c3beb532f cmake: Show supported formats in --help output for --profiling-format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: dublet <github@dublet.org>
Merge-request: !5001
 2020-07-13 07:49:47 -04:00
Kitware Robot
c441b8a7f8 CMake Nightly Date Stamp 2020-07-13 00:01:07 -04:00
Craig Scott
0bdb1a77d1 Help: Clarify wording of dir-related source property options 2020-07-13 10:06:52 +10:00
Kitware Robot
32c000823e CMake Nightly Date Stamp 2020-07-12 00:01:07 -04:00
Craig Scott
9c3beb532f cmake: Show supported formats in --help output for --profiling-format 
Fixes: #20943
 2020-07-11 23:14:03 +10:00
Kitware Robot
fd1df4995b CMake Nightly Date Stamp 2020-07-11 00:01:08 -04:00
Brad King
55b8b85e08 Merge branch 'release-3.18' 2020-07-10 08:11:30 -04:00
Brad King
6ab08c4e99 CMake 3.18.0-rc4 v3.18.0-rc4 2020-07-10 06:49:28 -04:00
Brad King
95db8c5db5 Merge topic 'variable_watch_docs' 
bb15663858 Help: Expand documentation of variable_watch()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4990
 2020-07-10 06:47:20 -04:00
Brad King
9e2d480a3f Merge topic 'string-cleanup' 
8ef18e8525 Clean a few string conversions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4997
 2020-07-10 06:46:28 -04:00
Brad King
1bfe1d42bc Merge topic 'source_file_both_props' into release-3.18 
961ee62faa Help: Update get_property and get_source_file_property docs
1235f2d747 set_property: Allow both DIRECTORY and TARGET_DIRECTORY together
177052d6b8 set_property: Fix name of TARGET_DIRECTORY option in error messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4994
 2020-07-10 06:45:09 -04:00
Brad King
78e89fea2d Merge branch 'release-3.18' 2020-07-10 06:45:09 -04:00
Brad King
a5064f6e65 Merge topic 'source_file_both_props' 
961ee62faa Help: Update get_property and get_source_file_property docs
1235f2d747 set_property: Allow both DIRECTORY and TARGET_DIRECTORY together
177052d6b8 set_property: Fix name of TARGET_DIRECTORY option in error messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4994
 2020-07-10 06:45:09 -04:00
Brad King
d8cdec066a Merge topic 'irsl-intel-ia32' into release-3.18 
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
bf3a1e9a9b Merge branch 'release-3.18' 2020-07-10 06:43:58 -04:00
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
2e290682b8 Merge topic 'FindOpenMP-version' into release-3.18 
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
1b12a0943d Merge branch 'release-3.18' 2020-07-10 06:42:43 -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
Kitware Robot
1e5f5fbb1e CMake Nightly Date Stamp 2020-07-10 00:01:08 -04:00
Petr Kmoch
bb15663858 Help: Expand documentation of variable_watch() 
Document parameters and corner-case behaviour of variable_watch() command.
 2020-07-09 17:22:59 +02:00
Vitaly Stakhovsky
8ef18e8525 Clean a few string conversions 2020-07-09 09:42:00 -04:00
Brad King
43372d5ba3 Merge topic 'file-GENERATE-tmp' 
4d40253f1c Tests: Cover file(GENERATE) using 'foo.tmp' as input for output 'foo'
eaa420e99c cmGeneratedFileStream: Use random temporary file extension by default
09ff1cb650 cmCTest: Explicitly specify '.tmp' extension on in-progress log files
0d3a034725 cmGeneratedFileStream: Optionally use custom temporary file extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4992
 2020-07-09 06:53:36 -04:00
Brad King
a054211dd9 Merge topic 'install' 
9a25278f8c Help: advise against CMAKE_INSTALL_PREFIX in install DESTINATION.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4988
 2020-07-09 06:52:55 -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
1d0452fd3e Merge branch 'release-3.18' 2020-07-09 06:49:22 -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
8e71d199dc Merge topic 'FindJava-no-macos-stub' into release-3.18 
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:21 -04:00
Brad King
8c477d7c61 Merge branch 'release-3.18' 2020-07-09 06:47:43 -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
e69c64a144 Merge topic 'cuda-11-ptx-arch' into release-3.18 
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:42 -04:00
Brad King
b507794046 Merge branch 'release-3.18' 2020-07-09 06:46:42 -04:00
Brad King
6ce96dfbc7 Merge topic 'doc-CPack-source-package' into release-3.18 
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
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
Alexandru Croitor
961ee62faa Help: Update get_property and get_source_file_property docs 
Specify the names and alternatives a bit more clearly.
 2020-07-09 06:35:06 -04:00
Alexandru Croitor
1235f2d747 set_property: Allow both DIRECTORY and TARGET_DIRECTORY together 
Allow to specify both DIRECTORY and TARGET_DIRECTORY at the same time in
`set_source_files_properties()` and `set_property(SOURCE)` commands.

Add test cases and update the documentation.

Fixes: #20932
 2020-07-09 06:33:52 -04:00
Alexandru Croitor
177052d6b8 set_property: Fix name of TARGET_DIRECTORY option in error messages 2020-07-09 06:33:03 -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
Kitware Robot
6f3a5fef84 CMake Nightly Date Stamp 2020-07-09 05:30:04 -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
Brad King
4d40253f1c Tests: Cover file(GENERATE) using 'foo.tmp' as input for output 'foo' 
Fixes: #20873
 2020-07-08 15:49:56 -04:00
Brad King
eaa420e99c cmGeneratedFileStream: Use random temporary file extension by default 
Avoid collisions with project-specified files named with `.tmp`.

Issue: #20873
 2020-07-08 15:49:56 -04:00
Brad King
09ff1cb650 cmCTest: Explicitly specify '.tmp' extension on in-progress log files 
Do not depend on `cmGeneratedFileStream` to have this default.
 2020-07-08 15:49:56 -04:00
Brad King
0d3a034725 cmGeneratedFileStream: Optionally use custom temporary file extension 2020-07-08 15:49:56 -04:00
zasdfg bnm
8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture 2020-07-08 13:35:12 -04:00