summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* GetFeature(): return cmPropVitaly Stakhovsky2020-07-116-17/+16
|
* CMake Nightly Date StampKitware Robot2020-07-111-1/+1
|
* Merge branch 'release-3.18'Brad King2020-07-100-0/+0
|\
| * CMake 3.18.0-rc4v3.18.0-rc4Brad King2020-07-101-1/+1
| |
* | Merge topic 'variable_watch_docs'Brad King2020-07-101-3/+36
|\ \ | | | | | | | | | | | | | | | | | | bb15663858 Help: Expand documentation of variable_watch() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4990
| * | Help: Expand documentation of variable_watch()Petr Kmoch2020-07-091-3/+36
| | | | | | | | | | | | Document parameters and corner-case behaviour of variable_watch() command.
* | | Merge topic 'string-cleanup'Brad King2020-07-105-16/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8ef18e8525 Clean a few string conversions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4997
| * | | Clean a few string conversionsVitaly Stakhovsky2020-07-095-16/+11
| | | |
* | | | Merge branch 'release-3.18'Brad King2020-07-100-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'source_file_both_props' into release-3.18Brad King2020-07-1010-33/+75
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ Merge topic 'source_file_both_props'Brad King2020-07-1010-33/+75
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Help: Update get_property and get_source_file_property docsAlexandru Croitor2020-07-092-2/+2
| | | | | | | | | | | | | | | | | | | | Specify the names and alternatives a bit more clearly.
| * | | | set_property: Allow both DIRECTORY and TARGET_DIRECTORY togetherAlexandru Croitor2020-07-096-26/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | set_property: Fix name of TARGET_DIRECTORY option in error messagesAlexandru Croitor2020-07-093-5/+5
| | | | |
* | | | | Merge branch 'release-3.18'Brad King2020-07-100-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'irsl-intel-ia32' into release-3.18Brad King2020-07-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f332ce12d6 IRSL: Fix path to Intel 32-bit redist libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4995
* | \ \ \ \ Merge topic 'irsl-intel-ia32'Brad King2020-07-101-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | f332ce12d6 IRSL: Fix path to Intel 32-bit redist libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4995
| * | | | | IRSL: Fix path to Intel 32-bit redist librariesTorgeir Rusten2020-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'release-3.18'Brad King2020-07-100-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'FindOpenMP-version' into release-3.18Brad King2020-07-101-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 656d6ea821 FindOpenMP: Set version variables every time CMake runs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4996
* | \ \ \ \ \ Merge topic 'FindOpenMP-version'Brad King2020-07-101-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 656d6ea821 FindOpenMP: Set version variables every time CMake runs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4996
| * | | | | | FindOpenMP: Set version variables every time CMake runsBrad King2020-07-091-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | CMake Nightly Date StampKitware Robot2020-07-101-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'file-GENERATE-tmp'Brad King2020-07-096-2/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Tests: Cover file(GENERATE) using 'foo.tmp' as input for output 'foo'Brad King2020-07-083-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20873
| * | | | | cmGeneratedFileStream: Use random temporary file extension by defaultBrad King2020-07-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid collisions with project-specified files named with `.tmp`. Issue: #20873
| * | | | | cmCTest: Explicitly specify '.tmp' extension on in-progress log filesBrad King2020-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Do not depend on `cmGeneratedFileStream` to have this default.
| * | | | | cmGeneratedFileStream: Optionally use custom temporary file extensionBrad King2020-07-082-2/+21
| | | | | |
* | | | | | Merge topic 'install'Brad King2020-07-091-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a25278f8c Help: advise against CMAKE_INSTALL_PREFIX in install DESTINATION. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4988
| * | | | | | Help: advise against CMAKE_INSTALL_PREFIX in install DESTINATION.Joachim Wuttke (h)2020-07-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as per my uncontradicted post https://discourse.cmake.org/t/local-install-vs-install-for-cpack-absolute-vs-relative-path/623/2?u=jwuttke
* | | | | | | Merge topic 'FindMatlab-unknown-version'Brad King2020-07-091-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3c389cb17 FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4986
| * | | | | | | FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown versionAlexey Kreschuk2020-07-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'cpack2'Brad King2020-07-091-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca9bd43f2d Help: Duplicate essential information on install paths in CPack. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4987
| * | | | | | | | Help: Duplicate essential information on install paths in CPack.Joachim Wuttke (h)2020-07-081-3/+7
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'release-3.18'Brad King2020-07-090-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge topic 'FindJava-no-macos-stub' into release-3.18Brad King2020-07-091-3/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8051b1f20 FindJava: Update check to avoid accepting macOS stub 'java' as Java Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4993
* | \ \ \ \ \ \ \ Merge topic 'FindJava-no-macos-stub'Brad King2020-07-091-3/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8051b1f20 FindJava: Update check to avoid accepting macOS stub 'java' as Java Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4993
| * | | | | | | | FindJava: Update check to avoid accepting macOS stub 'java' as JavaBrad King2020-07-081-3/+2
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge branch 'release-3.18'Brad King2020-07-090-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'cuda-11-ptx-arch' into release-3.18Brad King2020-07-091-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4991
* | \ \ \ \ \ \ \ Merge topic 'cuda-11-ptx-arch'Brad King2020-07-091-2/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4991
| * | | | | | | | FindCUDA/select_compute_arch: generate PTX for the latest architecturezasdfg bnm2020-07-081-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-07-090-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'doc-CPack-source-package' into release-3.18Brad King2020-07-091-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8b7acaf90 Help: Fix CPack module docs on config file for source package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4985
* | | | | | | | | Merge topic 'doc-CPack-source-package'Brad King2020-07-091-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8b7acaf90 Help: Fix CPack module docs on config file for source package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4985
| * | | | | | | | Help: Fix CPack module docs on config file for source packageJoachim Wuttke (h)2020-07-081-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-07-091-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.18'Craig Scott2020-07-080-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'ctest-resource-spec-file-doc' into release-3.18Craig Scott2020-07-088-4/+41
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c57695a2f4 Help: Clarify search order for resource spec file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4983
* | \ \ \ \ \ \ \ Merge topic 'ctest-resource-spec-file-doc'Craig Scott2020-07-088-4/+41
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | c57695a2f4 Help: Clarify search order for resource spec file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4983
generated by cgit v0.12 at 2025-01-07 18:29:31 (GMT)