summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | try_compile: Do not try to remove '.nfs*' filesBrad King2020-06-171-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | These files are part of the NFS implementation and should not be removed. They will automatically disappear when NFS is done with them. Fixes: #20844
* | | | Merge topic 'CUDAToolkit-cuda-11' into release-3.18Brad King2020-06-193-7/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b284a3c764 CudaToolkit: Update for new/removed libraries in CUDA 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4917
| * | | | CudaToolkit: Update for new/removed libraries in CUDA 11Robert Maynard2020-06-183-7/+38
| |/ / /
* | | | Merge topic 'cuda-toolkit-vs' into release-3.18Brad King2020-06-191-121/+130
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0280801f4 CUDA: Fix CMAKE_CUDA_COMPILER_TOOLKIT_ROOT detection in Visual Studio 90be0916b5 CUDA: Re-order some logic for determining the compiler 4ab5f109f0 CUDA: Remove unused variables while determining compiler 492e5f01fa CUDA: Simplify CMAKE_CUDA_COMPILER_TOOLKIT_ROOT computation 4785bd6153 CUDA: Skip the entire search for nvcc when it is CMAKE_CUDA_COMPILER Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4921
| * | | | CUDA: Fix CMAKE_CUDA_COMPILER_TOOLKIT_ROOT detection in Visual StudioBrad King2020-06-181-108/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a Visual Studio generator, we do not know the path to `CMAKE_CUDA_COMPILER` until after the compiler id detection project extracts it. However, based on the VS toolchain configuration we know that the compiler id will be NVIDIA, so use that to drive the CUDA architecture flag logic. After the main compiler id step we know `CMAKE_CUDA_COMPILER`, so `CMAKE_CUDA_COMPILER_TOOLKIT_ROOT` can then be computed.
| * | | | CUDA: Re-order some logic for determining the compilerBrad King2020-06-181-11/+9
| | | | |
| * | | | CUDA: Remove unused variables while determining compilerBrad King2020-06-181-2/+0
| | | | |
| * | | | CUDA: Simplify CMAKE_CUDA_COMPILER_TOOLKIT_ROOT computationBrad King2020-06-181-1/+1
| | | | |
| * | | | CUDA: Skip the entire search for nvcc when it is CMAKE_CUDA_COMPILERBrad King2020-06-181-80/+80
| | | | |
* | | | | Merge topic 'cuda_nvcc_exe_search' into release-3.18Brad King2020-06-191-7/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | d9c1f05924 CUDA: Fix NVCC executable search during compiler detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4920
| * | | | CUDA: Fix NVCC executable search during compiler detectionRaul Tambre2020-06-181-7/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The result variable was `CUDAToolkit_NVCC_EXECUTABLE` instead of `_CUDA_NVCC_EXECUTABLE`, which the rest of the code used. Also, we can simply `set()` the `_CUDA_NVCC_EXECUTABLE` value without searching. Fixes: #20847
* | | | Merge topic 'improve_device_link_policy_cross_ref' into release-3.18Brad King2020-06-182-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5279c2c8f Help: Better document that CMP0105 controls DEVICE_LINK parsing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4919
generated by cgit v0.12 at 2024-09-02 06:14:15 (GMT)