summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | Help: Fix typo in Help/prop_tgt/OSX_COMPATIBILITY_VERSION.rstIsuru Fernando2020-02-041-1/+1
| | | | | |
* | | | | | Merge topic 'sdcc-no-default-target'Brad King2020-02-052-11/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18d2e6fc8f SDCC: Remove default flags for a specific target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4321
| * | | | | | SDCC: Remove default flags for a specific targetfruit2020-02-042-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove defaults for a specific target (8051) because they are incorrect for other targets. Fixes: #20308
* | | | | | | Merge branch 'release-3.16'Brad King2020-02-050-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge topic 'vs-version-for-unity' into release-3.16Brad King2020-02-053-7/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9135954e2f VS: Do not use native unity builds on VS 2017 versions less than 15.8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4324
* | \ \ \ \ \ \ Merge topic 'vs-version-for-unity'Brad King2020-02-053-7/+12
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9135954e2f VS: Do not use native unity builds on VS 2017 versions less than 15.8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4324
| * | | | | | | VS: Do not use native unity builds on VS 2017 versions less than 15.8Brad King2020-02-043-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 version 15.8 introduced support for unity builds implemented in part by the `$(VCTargetsPath)/Microsoft.Cpp.Unity.targets` file. Do not enable unity builds on VS 15 versions that do not have that file. Fixes: #20284
* | | | | | | | CMake Nightly Date StampKitware Robot2020-02-051-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'release-3.15'Brad King2020-02-040-0/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | CMake 3.15.7v3.15.7Brad King2020-02-041-1/+1
| | | | | | |
* | | | | | | Merge topic 'cuda_remove_toolkit_dirs_from_implicit_includes'Brad King2020-02-041-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87df637078 CUDA: Do not treat CUDA toolkit include directories as implicit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4317
| * | | | | | | CUDA: Do not treat CUDA toolkit include directories as implicitRobert Maynard2020-02-031-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake properly detects the toolkit directories as implicit system includes, but CUDA compilers don't add explicit `-isystem` markups to these directories when compiling CUDA code. Due to this limitation, allow users to explicitly specify these directories as SYSTEM dirs. Fixes: #16464, #19864
* | | | | | | | Merge topic 'compiler-abi-no-Werror'Brad King2020-02-041-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5895f50c3 CMakeDetermineCompilerABI: Avoid failing on warnings with -Werror Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4316
| * | | | | | | | CMakeDetermineCompilerABI: Avoid failing on warnings with -WerrorDavid Rohr2020-02-031-0/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply remove `-Werror` flags from `CMAKE_<LANG>_FLAGS` to avoid failing ABI detection if there happen to be warnings in the test project. For example, `-Wunused-command-line-argument` warnings are common since the ABI detection project may not exercise all the flags passed by users. Fixes: #20305
* | | | | | | | Merge topic 'ninja-run-tool-in-builddir'Brad King2020-02-041-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4e02c46fc cmGlobalNinjaGenerator: run ninja tools in the build directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4319
| * | | | | | | | cmGlobalNinjaGenerator: run ninja tools in the build directoryBen Boeckel2020-02-031-0/+2
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #20303
* | | | | | | | Merge topic 'swift-exe-exports'Brad King2020-02-042-4/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e26d57188 Ninja: properly handle exports from Swift exes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4314
| * | | | | | | | Ninja: properly handle exports from Swift exesSaleem Abdulrasool2020-02-022-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds logic to properly handle Swift executables. Only executables marked as exporting symbols will now generate module interfaces for the executable.
* | | | | | | | | Merge branch 'release-3.16'Brad King2020-02-040-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge topic 'android-ndk-r19-binutils' into release-3.16Brad King2020-02-041-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3d3b7ddeb Android: Fix binutils selection with NDK r19+ unified toolchain Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4318