summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'macos-11-file-GET_RUNTIME_DEPENDENCIES' into release-3.18Brad King2020-07-142-13/+28
|\ | | | | | | | | | | | | | | | | d9af90504f Tests: Update file(G_R_D) test to make system library optional c51400033c file: Update GET_RUNTIME_DEPENDENCIES for macOS 11 dylib cache Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4998
| * Tests: Update file(G_R_D) test to make system library optionalKyle Edwards2020-07-131-12/+14
| | | | | | | | | | Since the system library may not exist on the filesystem on macOS 11, skip it if it doesn't exist.
| * file: Update GET_RUNTIME_DEPENDENCIES for macOS 11 dylib cacheBrad King2020-07-131-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | Starting on macOS 11, the dynamic loader has a builtin cache of system-provided dylib files. They do not actually exist on the filesystem. However, runtime dependencies recorded in Mach-O binaries can still have `LC_LOAD_DYLIB` entries referring to such dylib files by absolute path. The dynamic loader simply resolves the paths from its cache. Teach `file(GET_RUNTIME_DEPENDENCIES)` to skip dependencies on such dylib paths. For practical software distribution purposes they do not exist, or at least can be assumed available on all deployments. Issue: #20863
* | Merge topic 'profiling-case-insensitive-command-names' into release-3.18Brad King2020-07-143-2/+19
|\ \ | | | | | | | | | | | | | | | | | | 7cf2f7d2af cmake: Store lowercase command names in profiling output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5007
| * | cmake: Store lowercase command names in profiling outputCraig Scott2020-07-133-2/+19
| |/ | | | | | | | | | | | | This ensures commands can be properly aggregated by tools processing the profiling output. Fixes: #20946
* | Merge topic 'imported-local-target-alias' into release-3.18Brad King2020-07-135-6/+28
|\ \ | | | | | | | | | | | | | | | | | | 7b0f6508a0 ALIAS targets: Non-global aliases must be propagated to sub-directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5002
| * | ALIAS targets: Non-global aliases must be propagated to sub-directoriesMarc Chevrier2020-07-115-6/+28
| |/ | | | | | | Fixes: #20942
* | Merge topic 'doc-source-prop-dir-options' into release-3.18Brad King2020-07-134-56/+84
|\ \ | | | | | | | | | | | | | | | | | | 0bdb1a77d1 Help: Clarify wording of dir-related source property options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5000
| * | Help: Clarify wording of dir-related source property optionsCraig Scott2020-07-134-56/+84
| |/
* | Merge topic 'supported-profiling-formats' into release-3.18Brad King2020-07-131-1/+3
|\ \ | |/ |/| | | | | | | | | | | 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
| * cmake: Show supported formats in --help output for --profiling-formatCraig Scott2020-07-111-1/+3
|/ | | Fixes: #20943
* CMake 3.18.0-rc4v3.18.0-rc4Brad King2020-07-101-1/+1
|
* 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
| * 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 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
| * | 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 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
| * | | 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
* | | 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
| * | | 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 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
| * | | FindCUDA/select_compute_arch: generate PTX for the latest architecturezasdfg bnm2020-07-081-2/+2
| | | |
* | | | 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
| * | | Help: Fix CPack module docs on config file for source packageJoachim Wuttke (h)2020-07-081-1/+1
| | |/ | |/|
* | | 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
| * | | Help: Clarify search order for resource spec fileKyle Edwards2020-07-078-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify the order in which --resource-spec-file, RESOURCE_SPEC_FILE, and CTEST_RESOURCE_SPEC_FILE are searched, and add tests to enforce this. Fixes: #20914
* | | | Merge topic 'FindMPI-nvcc-link-pthread' into release-3.18Brad King2020-07-081-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 33192e1b5f FindMPI: Pass -pthread to NVCC through -Xlinker for device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4981
| * | | FindMPI: Pass -pthread to NVCC through -Xlinker for device linkingRobert Maynard2020-07-071-0/+2
| | | | | | | | | | | | | | | | Fixes: #20924
* | | | Merge topic 'cuda-11-compute-arch' into release-3.18Brad King2020-07-081-7/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | FindCUDA/select_compute_arch: Add CUDA 11 and Ampere supportzasdfg bnm2020-07-071-7/+27
| | |_|/ | |/| | | | | | | | | | Co-Author: Henry Schreiner <henryschreineriii@gmail.com>
* | | | Merge topic 'find-blas-lapack-mklroot-win' into release-3.18Brad King2020-07-082-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 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
| * | | FindLAPACK: Handle Windows Intel MKLROOT with backslashMichael Hirsch2020-07-071-1/+1
| | | |
| * | | FindBLAS: Handle Windows Intel MKLROOT with backslashMichael Hirsch2020-07-071-1/+1
| |/ /
* | | Merge topic 'cmake-gui-qt-5.14' into release-3.18Brad King2020-07-071-4/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 8eb7cf9b5f cmake-gui: Fix compilation as C++14 with Qt 5.14 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4978
| * | cmake-gui: Fix compilation as C++14 with Qt 5.14Brad King2020-07-061-4/+4
| |/ | | | | | | | | | | Fix code added by commit d7679f6427 (QCMakeCacheView: use non-deprecated List and Set constructions, 2020-06-10, v3.18.0-rc2~13^2), used conditionally on Qt 5.14 or above, to compile as C++14.
* | Merge topic 'FindMPI-nvcc-fexceptions' into release-3.18Brad King2020-07-071-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | b725a19072 FindMPI: Deny -fexceptions from NVCC Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4970
| * | FindMPI: Deny -fexceptions from NVCCAxel Huebl2020-07-061-1/+3
| |/ | | | | | | | | | | Do not forward -fexceptions (set from MVAPICH2) to NVCC. Fixes: #18558
* | Merge branch 'cmext-vs16-declval' into release-3.18Brad King2020-07-061-8/+9
|\ \ | | | | | | | | | Merge-request: !4971
| * | cmext: Implement cm::static_reference_cast by declvalSumit Bhardwaj2020-07-061-8/+9
| |/ | | | | | | | | | | | | | | | | Previously, `cm::static_reference_cast` used `invoke_result_t` and took the address of `O::get`. This is not in complete conformance with standard. Change the implementation to use `std::declval<O>.get()` which is always well-defined.
* | Merge topic 'doc-file_ARCHIVE_synopsis' into release-3.18Brad King2020-07-061-2/+2
|\ \ | | | | | | | | | | | | | | | | | | f9766dad19 Help: Update file(ARCHIVE...) synopsis for renamed options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4977
| * | Help: Update file(ARCHIVE...) synopsis for renamed optionsCraig Scott2020-07-061-2/+2
|/ / | | | | | | | | | | | | | | | | The FILES and DIRECTORY options were renamed in bbcff21f71 (file(ARCHIVE*): Collapse FILES and DIRECTORY options, 2020-06-30), but the synopsis part of the file() documentation was missed. The synopsis also typically only shows the mandatory options. Update the synopsis to reflect the name changes and omit the DESTINATION option since it is not mandatory.
* | Merge topic 'doc-FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG' into release-3.18Craig Scott2020-07-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 3bb287581c Help: FRAMEWORK_MULTI_CONFIG_POSTFIX example should use actual config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4973
| * | Help: FRAMEWORK_MULTI_CONFIG_POSTFIX example should use actual configCraig Scott2020-07-051-1/+1
|/ /
* | Merge topic 'restore-cwd-translation-map' into release-3.18Brad King2020-07-039-1/+62
|\ \ | | | | | | | | | | | | | | | | | | 85a945a607 Restore handling of build directory inside a symlinked path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4963
| * | Restore handling of build directory inside a symlinked pathBrad King2020-07-029-1/+62
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit dd8365b3f1 (Merge branch 'upstream-KWSys' into update-kwsys, 2020-04-06, v3.18.0-rc1~397^2) we imported KWSys commit `019afb6ea` (SystemTools: Drop GetCurrentWorkingDirectory 'collapse' argument, 2020-04-03). That caused `GetCurrentWorkingDirectory` to no longer send paths through the KWSys translation map and broke CMake's detection of the absolute path to a build directory containing a symbolic link. Add our own `cmSystemTools::GetCurrentWorkingDirectory` wrapper around the KWSys method in order to restore that mapping. Test-case-by: Ben Boeckel <ben.boeckel@kitware.com> Issue: #16228 Fixes: #20900
* | Merge topic 'FindLua-5.4' into release-3.18Brad King2020-07-021-1/+1
|\ \ | | | | | | | | | | | | | | | | | | bbb7f0e271 FindLua: Add support for Lua 5.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4959
| * | FindLua: Add support for Lua 5.4Felix Yan2020-07-011-1/+1
| |/
* | Merge topic 'update-curl' into release-3.18Brad King2020-07-0240-219/+251
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 6d423195d5 Merge branch 'upstream-curl' into update-curl 4446fda8e0 curl 2020-06-30 (5a1fc8d3) 4e9685f657 curl: Update script to get curl 7.71.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4958
generated by cgit v0.12 at 2025-03-13 13:30:36 (GMT)