summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| * \ Merge branch 'upstream-curl' into update-curlBrad King2020-07-0139-218/+250
| |\ \ | | | | | | | | | | | | | | | | * upstream-curl: curl 2020-06-30 (5a1fc8d3)
| | * | curl 2020-06-30 (5a1fc8d3)Curl Upstream2020-07-0139-218/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 5a1fc8d33808d7b22f57bdf9403cda7ff07b0670 (curl-7_71_1).
| * | | curl: Update script to get curl 7.71.1Brad King2020-07-011-1/+1
| | |/ | |/|
* | | Merge topic 'uv-check-return' into release-3.18Brad King2020-07-022-2/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 0fddcc1e5b cmake: Tolerate nullptr from uv_default_loop Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4962
| * | cmake: Tolerate nullptr from uv_default_loopBrad King2020-07-012-2/+6
|/ / | | | | | | | | | | | | `uv_default_loop()` can return `nullptr` when running on a Linux kernel configured without `CONFIG_EVENTFD`. Fixes: #20899
* | CMake 3.18.0-rc3v3.18.0-rc3Brad King2020-07-011-1/+1
| |
* | Merge topic 'file-ARCHIVE-files-dirs' into release-3.18Brad King2020-07-014-63/+52
|\ \ | | | | | | | | | | | | | | | | | | bbcff21f71 file(ARCHIVE*): Collapse FILES and DIRECTORY options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4955
| * | file(ARCHIVE*): Collapse FILES and DIRECTORY optionsCraig Scott2020-06-304-63/+52
| | | | | | | | | | | | | | | | | | | | | | | | The two options were concatenated internally for both ARCHIVE_CREATE and ARCHIVE_EXTRACT. The distinction between files and dirs was not meaningful. Therefore, replace them with PATHS or PATTERNS to more accurately describe the way the options are used. Fixes: #20884
* | | Merge topic 'fileapi-version-doc' into release-3.18Brad King2020-06-302-1/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e9be17ab42 Help: Update FileAPI codemodel version to 2.1, add release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4956
| * | | Help: Update FileAPI codemodel version to 2.1, add release notesKyle Edwards2020-06-302-1/+9
|/ / / | | | | | | | | | This fixes the documentation which should have been fixed in 9f6d40ee.
* | | Merge topic 'file-CONFIGURE-subdir' into release-3.18Brad King2020-06-306-3/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e5f5eeca2f file: Fix CONFIGURE output relative path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4951
| * | | file: Fix CONFIGURE output relative pathBrad King2020-06-296-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a6fee09484 (file: Add CONFIGURE subcommand, 2020-03-06, v3.18.0-rc1~584^2) we accidentally treated relative path outputs with respect to the current working directory. Treat them with respect to the current binary directory instead. Fixes: #20885
* | | | Merge topic 'find_library-file-readable' into release-3.18Brad King2020-06-305-3/+24
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | f2c903fb9a find_library: Check that library files are readable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4945
| * | | find_library: Check that library files are readableBrad King2020-06-295-3/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 6b85166920 (ENH: Refactor find_library search logic, 2008-09-22, v2.8.0~1665) dropped a call to `FileExists` on the path under the assumption that the presence of a file in a directory listing means it exists. However, dropping that also dropped a check that verifies the file is readable. Restore the `FileExists` call to ensure that we only find readable libraries.
* | | Merge topic 'file-ARCHIVE_CREATE-rename-TYPE-option' into release-3.18Brad King2020-06-2921-42/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95159b7dea file(ARCHIVE_CREATE): Rename TYPE option to COMPRESSION bc45bdc819 Help: Fix contents indenting for file(ARCHIVE_...) subcommands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4948
| * | | file(ARCHIVE_CREATE): Rename TYPE option to COMPRESSIONCraig Scott2020-06-2721-39/+54
| | | | | | | | | | | | Fixes: #20883
| * | | Help: Fix contents indenting for file(ARCHIVE_...) subcommandsCraig Scott2020-06-271-3/+3
| | | |
* | | | Merge topic 'gtest-xml-output' into release-3.18Brad King2020-06-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75aa3ee7e7 GoogleTest: Fix name generation for XML_OUTPUT_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4942
| * | | | GoogleTest: Fix name generation for XML_OUTPUT_DIRStefan Floeren2020-06-261-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Google test framework allows to write the results into an XML file since commit e9ab39eb1d (GoogleTest: Add XML_OUTPUT_DIR parameter, 2020-03-06, v3.18.0-rc1~538^2~2). This file is passed on the command line: `--gtest_output=xml:FILE_NAME`. The module allows to specify a directory to save those files with **TEST_XML_OUTPUT_PARAM**. If the option is set, the filename will be set to `${prefix}${pretty_suite}.${pretty_test}${suffix}.xml`. The pretty names contain parameters for the tests, if value-parameterized tests are used. These parameters may not be safe to use in file names. There are two possible options: 1. sanitize the file name 2. omit the values and use the internal numbering of gtest This commit chose option 2. The testname needs to be a valid C++ identifier and should therefore be reasonable for a filename. Note that the generated names contain slashes. This will lead to subdirectories, but works on both Linux and Windows. Fixes: #20877
* | | | Merge topic 'intel-c++20' into release-3.18Brad King2020-06-291-0/+10
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 99c8dbf497 Intel: Add flags for C++20 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4946
| * | | Intel: Add flags for C++20Brad King2020-06-261-0/+10
| |/ / | | | | | | | | | | | | Patch-by: Matheus Izvekov Fixes: #20880
* | | Merge topic 'GoogleTest-DISCOVERY_MODE-cleanups' into release-3.18Brad King2020-06-266-10/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1458b4c048 Help: Add CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE to release notes 642ea49115 GoogleTest: Replace SEND_ERROR with FATAL_ERROR 09c38e8de6 Tests: Don't ask for things not required for GoogleTest Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4938
| * | | Help: Add CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE to release notesCraig Scott2020-06-241-1/+3
| | | |