summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FileAPI test: Add infrastructure for reading JSON test dataKyle Edwards2020-02-071-0/+6
|
* Merge topic 'cmake-gui-env-platform-defaults'Brad King2020-02-073-3/+59
|\ | | | | | | | | | | | | 9a71fa46e7 cmake-gui: set generator field defaults from environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4312
| * cmake-gui: set generator field defaults from environmentCode Smith2020-02-063-3/+59
| | | | | | | | Fixes: #20251
* | Merge branch 'release-3.16'Brad King2020-02-070-0/+0
|\ \
| * \ Merge branch 'libarchive-win-codepage' into release-3.16Brad King2020-02-061-2/+5
| |\ \ | | | | | | | | | | | | Merge-request: !4332
* | \ \ Merge branch 'release-3.17'Brad King2020-02-070-0/+0
|\ \ \ \
| * \ \ \ 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
* | | | | Merge topic 'libarchive-win-codepage'Brad 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 branch 'release-3.17'Brad King2020-02-070-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | 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
* | \ \ \ Merge topic 'ninja-multi-default-config-fix'Brad 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 branch 'release-3.17'Brad King2020-02-070-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'ninja-multi-no-minsizerel'Brad 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 branch 'release-3.17'Brad King2020-02-070-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | | | | Merge topic 'cuda_toolkit_add_cupti'Brad 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
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-02-071-1/+1
| | | | |
* | | | | Merge topic 'cmakefiles-rules-ninja'Brad King2020-02-061-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65679ed8d9 Ninja: Move rules.ninja into CMakeFiles Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4328
| * | | | | Ninja: Move rules.ninja into CMakeFilesKyle Edwards2020-02-051-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Since this is an implementation detail, it should not be user- visible. Move it into the implementation directory.
* | | | | CMake Nightly Date StampKitware Robot2020-02-061-1/+1
|/ / / /
* | | | Begin post-3.17 developmentBrad King2020-02-053-2/+11
| | | |
* | | | Merge branch 'release-3.17'Brad King2020-02-053-12/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | 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