summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-multi-default-configs-fix' into release-3.17Brad King2020-02-125-6/+53
|\ | | | | | | | | | | | | 46c836644d Ninja Multi-Config: Fix issue with "all" in CMAKE_NMC_DEFAULT_CONFIGS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4349
| * Ninja Multi-Config: Fix issue with "all" in CMAKE_NMC_DEFAULT_CONFIGSKyle Edwards2020-02-115-6/+53
| | | | | | | | | | | | | | | | Prior to this fix, CMAKE_NMC_DEFAULT_CONFIGS would inherit "all" from the union of CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG and CMAKE_NMC_CROSS_CONFIGS. This is inconsistent with the behavior of the "all" target signifying CMAKE_NMC_CROSS_CONFIGS. Update "all" in CMAKE_NMC_DEFAULT_CONFIGS to inherit only from CMAKE_NMC_CROSS_CONFIGS.
* | Merge topic 'file-CONFIGURE_DEPENDS-verify-CMP0009' into release-3.17Brad King2020-02-127-3/+33
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 818ec34bdd file: GLOB_RECURSE VerifyGlobs.cmake should have CMP0009 set to new b620dc566d file: Fix GLOB_RECURSE LIST_DIRECTORIES documentation regarding CMP0009 715f90bdd9 Tests: Perform minor cleanups in RunCMake.file test Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4342
| * | file: GLOB_RECURSE VerifyGlobs.cmake should have CMP0009 set to newShane Parris2020-02-116-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain cases, rebuilds with CMake using the CONFIGURE_DEPENDS flag with GLOB_RECURSE could result in a reconfigure loop due to CMP0009 not being propogated to the generated VerifyGlobs.cmake script. During the inital configuration phase, RecurseThroughSymlinksOn() is called for recursive glob operations either by having the CMP0009 status not set to NEW or by explicitly providing the FOLLOW_SYMLINKS flag. At the end when the VerifyGlobs script is created, the FOLLOW_SYMLINKS flag is written according to the final resolved form through a call to GetRecurseThroughSymlinks(). Thus, setting CMP0009 to NEW in the generated file is safe and allows correct behavior whether or not the end user sets the policy status to NEW or OLD.
| * | file: Fix GLOB_RECURSE LIST_DIRECTORIES documentation regarding CMP0009Shane Parris2020-02-111-1/+1
| | |
| * | Tests: Perform minor cleanups in RunCMake.file testShane Parris2020-02-111-2/+2
| | |
* | | Merge topic 'install-default-fix' into release-3.17Brad King2020-02-127-18/+50
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 9442ae5083 install: Fix regression when using default destinations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4340
| * | install: Fix regression when using default destinationsKyle Edwards2020-02-117-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 9fc20a4f3e (install: Add sane set of defaults for DESTINATION and file type parameters, 2018-11-02, v3.14.0-rc1~410^2~1), a regression was introduced, in which an `install(TARGETS)` with a RUNTIME/LIBRARY/ARCHIVE DESTINATION but no PUBLIC_HEADER/PRIVATE_HEADER DESTINATION would then install the headers. The old behavior did not do this. Restore the old behavior. Fixes: #20326
* | | Merge topic 'link-line-backtrace' into release-3.17Brad King2020-02-119-93/+85
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8752c1bd64 Merge branch 'backport-3.16-link-line-backtrace' e756328434 Propagate backtraces from LINK_LIBRARIES through to link line items Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Dennis Klein <d.klein@gsi.de> Merge-request: !4344
| * \ \ Merge branch 'backport-3.16-link-line-backtrace'Brad King2020-02-109-93/+85
| |\ \ \ | | |_|/ | |/| |
| | * | Propagate backtraces from LINK_LIBRARIES through to link line itemsBrad King2020-02-109-93/+85
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d4d0dd0f6a (cmLinkLineComputer: Add ComputeLinkLibs overload with backtraces, 2019-09-13, v3.16.0-rc1~87^2~4), backtraces have been collected by `ComputeLinkLibs` by looking back through the link implementation libraries for one matching the text of the link line item. This is slow in projects with long link lines. Instead, teach `cmComputeLinkDepends` and `cmComputeLinkInformation` to carry backtrace information explicitly along with the text of each item. Fixes: #20322
* | | Merge topic 'ExternalProject-submodules-recurse' into release-3.17Brad King2020-02-111-19/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0ba8010255 ExternalProject: Fix git submodule recursion on update Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4346
| * | | ExternalProject: Fix git submodule recursion on updateCharis Marangos2020-02-101-19/+28
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 5bc6230741 (ExternalProject: Option to turn off recursive update of git submodules, 2019-10-16) we implemented the feature in the clone script written by `_ep_write_gitclone_script` but not in the update script written by `_ep_write_gitupdate_script`. Implement the latter by factoring out a common helper to use in both places. Fixes: #20335
* | | Merge topic 'FindOpenMP-clang-windows' into release-3.17Brad King2020-02-111-7/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ceb5ee4a7b FindOpenMP: Add support for Clang on Windows 2dbff623f9 FindOpenMP: Save flags/libs in cache entries each time they are detected Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4327
| * | | FindOpenMP: Add support for Clang on WindowsTim Hutton2020-02-101-1/+20
| | | | | | | | | | | | | | | | Fixes: #19404
| * | | FindOpenMP: Save flags/libs in cache entries each time they are detectedTim Hutton2020-02-101-6/+5
| |/ /
* | | Merge topic 'FindPython-reduce-resources-comsumption' into release-3.17Brad King2020-02-112-88/+138
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3dab4682f6 FindPython: reduces consumption of resources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4338
| * | | FindPython: reduces consumption of resourcesMarc Chevrier2020-02-102-88/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Stores more information in the cache to reduce the number of sub-processes required on subsequent find_package calls. Fixes: #20337
* | | | Merge topic 'swift-no-sdk-include' into release-3.17Brad King2020-02-117-1/+89
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c2a92f44f Swift: Exclude SDK include paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4315
| * | | | Swift: Exclude SDK include pathsYauheni Khnykin2020-02-107-1/+89
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Populate `CMAKE_Swift_IMPLICIT_INCLUDE_DIRECTORIES` with the macOS SDK's include directory so that we filter such implicit directories out of Swift targets. Fixes: #19845
* | | | Merge topic 'FindMPI-fix-rerun' into release-3.17Brad King2020-02-111-12/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4d5ea8233 FindMPI: Preserve order of include directories on re-runs of CMake 8261ee3a9c FindMPI: Restore re-construction of include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4341
| * | | | FindMPI: Preserve order of include directories on re-runs of CMakeBrad King2020-02-101-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 5861c6d450 (FindMPI: Preserve include order when extracting component directories, 2019-12-19) only works on the first run of CMake in which we find MPI. Extend the fix to save the compiler wrapper's entire include path in our cache without splitting anything out. That way we can preserve the order when CMake re-runs. Fixes: #20338
| * | | | FindMPI: Restore re-construction of include directoriesBrad King2020-02-101-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 5861c6d450 (FindMPI: Preserve include order when extracting component directories, 2019-12-19) only works on the first run of CMake in which we find MPI. It preserves the include directories on the first run but still splits them up and saves the pieces in the cache. On future runs the pieces are not re-assembled, and we do not know the order anyway. Restore the re-assembly step so that at least all the include dirs are available. Leave preservation of the original order to later work. Issue: #20338
* | | | | Merge topic 'ninja-multi-depfile' into release-3.17Brad King2020-02-106-1/+23
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 67102d3252 Ninja Multi-Config: Add support for DEPFILE option in add_custom_command() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4334
| * | | | Ninja Multi-Config: Add support for DEPFILE option in add_custom_command()Kyle Edwards2020-02-076-1/+23
|/ / / / | | | | | | | | | | | | And give other generators a path forward to add support in the future.
* | | | Merge topic 'libarchive-win-codepage' into release-3.17Brad King2020-02-071-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16e31523ba libarchive: Add support for UTF-8 locale on Windows f7c54d2049 libarchive: Fix WideCharToMultiByte output buffer size Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4332
| * | | | libarchive: Add support for UTF-8 locale on WindowsBrad King2020-02-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport libarchive upstream commit `c46e7993` (windows: Support UTF-8 locale, 2018-07-23, v3.4.0~105^2). Fixes: #20320
| * | | | libarchive: Fix WideCharToMultiByte output buffer sizeBrad King2020-02-061-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Fix `archive_string_append_from_wcs_in_codepage` to account for the already-used portion of the buffer when computing the size of the remaining buffer for ``WideCharToMultiByte` output.
* | | | Merge topic 'ninja-multi-default-config-fix' into release-3.17Brad King2020-02-073-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1844be451e Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4331
| * | | | Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIGKyle Edwards2020-02-063-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue where CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG is specified and CMAKE_NMC_CROSS_CONFIGS is not, which results in a false error with CMAKE_NMC_DEFAULT_CONFIGS.
* | | | | Merge topic 'ninja-multi-no-minsizerel' into release-3.17Brad King2020-02-077-9/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e219de4fb Ninja Multi-Config: Don't include MinSizeRel by default Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4326
| * | | | | Ninja Multi-Config: Don't include MinSizeRel by defaultKyle Edwards2020-02-067-9/+30
| |/ / / /
* | | | | Merge topic 'cuda_toolkit_add_cupti' into release-3.17Brad King2020-02-071-3/+25
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27b0d908d4 CUDAToolkit: Add support for cupti library c3d7f2e43b CUDAToolkit: Correct location of OpenCL doc link Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4329
| * | | | CUDAToolkit: Add support for cupti libraryRobert Maynard2020-02-061-1/+23
| | | | | | | | | | | | | | | | | | | | Fixes: #20318
| * | | | CUDAToolkit: Correct location of OpenCL doc linkRobert Maynard2020-02-061-2/+2
| | |_|/ | |/| |
* | | | Begin 3.17 release versioningBrad King2020-02-051-3/+3
| | | |
* | | | Help: Drop development topic notes to prepare releaseBrad King2020-02-052-9/+0
|/ / / | | | | | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* | | Merge topic 'doc-3.17-relnotes'Brad King2020-02-0562-394/+317
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 730a53ef1d Help: Organize and revise 3.17 release notes ad33da76b1 Help: Consolidate 3.17 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4322
| * | | Help: Organize and revise 3.17 release notesBrad King2020-02-051-184/+218
| | | | | | | | | | | | | | | | | | | | Add section headers similar to the 3.16 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * | | Help: Consolidate 3.17 release notesBrad King2020-02-0562-394/+283
|/ / / | | | | | | | | | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.17.rst`.
* | | Merge branch 'release-3.16'Brad King2020-02-050-0/+0
|\ \ \ | |/ /
| * | CMake 3.16.4v3.16.4Brad King2020-02-051-1/+1
| | |
* | | Merge topic 'ninja-multi-cmake-build-no-config'Brad King2020-02-0511-17/+82
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd4ae2af0f Help: Make note of ninja -f argument in Ninja Multi-Config docs 79e5b3c46a Help: Explain new behavior of cmake --build in Ninja Multi-Config 16a4ba5b31 Ninja Multi-Config: Use build.ninja if cmake --build has no --config 2ac835b9f9 Refactor: Allow generators to decide default configuration for build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4323
| * | | Help: Make note of ninja -f argument in Ninja Multi-Config docsKyle Edwards2020-02-041-1/+2
| | | |
| * | | Help: Explain new behavior of cmake --build in Ninja Multi-ConfigKyle Edwards2020-02-041-0/+5
| | | |
| * | | Ninja Multi-Config: Use build.ninja if cmake --build has no --configKyle Edwards2020-02-046-13/+54
| | | | | | | | | | | | | | | | | | | | | | | | If cmake --build is called with no --config argument, and a build.ninja file is available, use that instead of defaulting to the Debug config.
| * | | Refactor: Allow generators to decide default configuration for buildKyle Edwards2020-02-044-3/+21
| | | | | | | | | | | | | | | | And allow them to read any cache values they need.
* | | | Merge topic 'llvm-rc-preprocess'Brad King2020-02-0512-0/+169
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c2d031cbd Add -E cmake_llvm_rc to preprocess files for llvm-rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4219
| * | | | Add -E cmake_llvm_rc to preprocess files for llvm-rcThomas Bernard2020-02-0412-0/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | llvm-rc requires preprocessed rc files. The CMake command line tool cmake_llvm_rc enables channing the preprocessor call and the resource compiler and make this appear as single compilation step. When llvm-rc is detected as resource compiler, the RC compilation step is set to use this command.
* | | | | Merge topic 'typo'Brad King2020-02-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 878a096914 Help: Fix typo in Help/prop_tgt/OSX_COMPATIBILITY_VERSION.rst Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4325
generated by cgit v0.12 at 2024-11-11 21:18:47 (GMT)