summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| | | |
| * | | GoogleTest: Replace SEND_ERROR with FATAL_ERRORCraig Scott2020-06-241-1/+1
| | | | | | | | | | | | | | | | We want to fail and halt immediately upon any error, not continue past a fatal problem.
| * | | Tests: Don't ask for things not required for GoogleTestCraig Scott2020-06-244-8/+4
| | | | | | | | | | | | | | | | The test cases only need C or C++, but not both. The CTest module is also not needed because we are not running a dashboard script.
* | | | Merge topic 'update-curl' into release-3.18Brad King2020-06-26173-4703/+8369
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5ff413f41 curl: Set build options the way we need for CMake 0ef8fa5000 Merge branch 'upstream-curl' into update-curl 5717fdc114 curl 2020-06-23 (e9db32a0) 39f7cfad31 curl: Update script to get curl 7.71.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4937
| * | | curl: Set build options the way we need for CMakeBrad King2020-06-241-0/+6
| | | |
| * | | Merge branch 'upstream-curl' into update-curlBrad King2020-06-24172-4702/+8362
| |\ \ \ | | | |/ | | |/| | | | | | | | | * upstream-curl: curl 2020-06-23 (e9db32a0)
| | * | curl 2020-06-23 (e9db32a0)Curl Upstream2020-06-24172-4703/+8364
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit e9db32a09af03f27e86d1251a9e68e9b7486d371 (curl-7_71_0).
| * | | curl: Update script to get curl 7.71.0Brad King2020-06-241-1/+1
| | |/ | |/|
* | | Merge topic 'doc-get_target_property' into release-3.18Brad King2020-06-231-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f4b911a2c9 Help: Update docs for failure result of get_target_property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4933
| * | | Help: Update docs for failure result of get_target_propertyChristopher Tetreault2020-06-231-5/+5
| |/ / | | | | | | | | | | | | | | | If `get_target_property` fails to find a value for a non-inherited property, it appends `-NOTFOUND` to the var name and sets that as the result, rather than setting the value of the var to `NOTFOUND`.
* | | Merge topic 'VxWorks-platform-id' into release-3.18Brad King2020-06-231-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b22586be01 VxWorks: Add Platform ID for Modules/CMakePlatformId.h.in Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4922
| * | | VxWorks: Add Platform ID for Modules/CMakePlatformId.h.inLihua Zhao2020-06-231-0/+3
| |/ /
* | | Merge topic 'makefile-fix-verbose' into release-3.18Brad King2020-06-231-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7f78bc42cb Makefile: Fix regression in .SILENT rule Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4928
| * | | Makefile: Fix regression in .SILENT ruleDaniel Colascione2020-06-221-3/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d74e651b78 (Makefiles: Re-implement makefile target path escaping and quoting, 2020-04-10, v3.18.0-rc1~334^2~1), `WriteMakeRule` now correctly escapes `$` in make target paths as `$$`. However, this caused an existing call site to escape the `$(VERBOSE)` variable reference in the `.SILENT` prefix, making it ineffective. Sub-makefiles are invoked with `MAKESILENT`, so this bug matters only for the `all` target, which emits progress messages from toplevel. Before: # Suppress display of executed commands. $$(VERBOSE).SILENT: After: # Suppress display of executed commands. $(VERBOSE).SILENT:
* | | Merge topic 'fix-win-flex-bison' into release-3.18Brad King2020-06-232-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0faa2b9870 Find{FLEX,BISON}: Add 'win-' executable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4931
| * | | Find{FLEX,BISON}: Add 'win-' executable namesYan2020-06-222-2/+2
| | | | | | | | | | | | | | | | | | | | Distributions of these tools on Windows now use a `win-` prefix instead of the previously-seen `win_` prefix. Search for both.
* | | | Merge topic 'FindCUDA-11' into release-3.18Brad King2020-06-231-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d9f2f9714 FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4929
| * | | | FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11Robert Maynard2020-06-221-2/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | The nppicom library has been removed in preference of nvjpeg starting in CUDA 11. Fixes: #20845
* | | | Merge topic 'test-all-find-modules' into release-3.18Brad King2020-06-233-35/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c6b227813 Tests: Drop redundant FindModulesExecuteAll test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4930
| * | | | Tests: Drop redundant FindModulesExecuteAll testBrad King2020-06-233-35/+0
| |/ / / | | | | | | | | | | | | | | | | This test has been superseded by `CMakeOnly.AllFindModules`, which does much more checking anyway.
* | | | Merge topic 'try_compile-nfs' into release-3.18Brad King2020-06-191-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9a258c302 try_compile: Do not try to remove '.nfs*' files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Acked-by: Axel Huebl <axel.huebl@plasma.ninja> Merge-request: !4913
generated by cgit v0.12 at 2025-04-22 18:18:04 (GMT)