mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-21 05:38:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
46,746 Commits 2 Branches 399 Tags
d31f31714bb0b4e027ed99998e5f90ebe52d9304
Commit Graph

46746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot d31f31714b CMake Nightly Date Stamp 2020-02-11 00:01:09 -05:00
Brad King ce0b40a4bb Merge branch 'release-3.17' 2020-02-10 10:39:49 -05:00
Brad King 205293d7eb Merge topic 'ninja-multi-depfile' 
67102d3252 Ninja Multi-Config: Add support for DEPFILE option in add_custom_command()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4334
 2020-02-10 10:39:49 -05:00
Brad King 35e9fbec0b Merge topic 'ninja-multi-depfile' into release-3.17 
67102d3252 Ninja Multi-Config: Add support for DEPFILE option in add_custom_command()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4334
 2020-02-10 10:39:48 -05:00
Kitware Robot 799bfb7132 CMake Nightly Date Stamp 2020-02-10 00:01:07 -05:00
Kitware Robot cb967317e4 CMake Nightly Date Stamp 2020-02-09 00:01:05 -05:00
Kitware Robot f77f64f793 CMake Nightly Date Stamp 2020-02-08 00:01:08 -05:00
Kyle Edwards 67102d3252 Ninja Multi-Config: Add support for DEPFILE option in add_custom_command() 
And give other generators a path forward to add support in the future.
 2020-02-07 14:18:54 -05:00
Brad King 3844e2ae4c Merge topic 'cmake-gui-env-platform-defaults' 
9a71fa46e7 cmake-gui: set generator field defaults from environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4312
 2020-02-07 10:37:35 -05:00
Brad King c1651ae251 Merge branch 'release-3.16' 2020-02-07 10:26:19 -05:00
Brad King 1cc457873d Merge branch 'release-3.17' 2020-02-07 10:23:45 -05:00
Brad King b428224867 Merge topic 'libarchive-win-codepage' 
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
 2020-02-07 10:23:45 -05:00
Brad King ad17c37d34 Merge topic 'libarchive-win-codepage' into release-3.17 
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
 2020-02-07 10:23:44 -05:00
Brad King fe8017892e Merge branch 'release-3.17' 2020-02-07 09:26:37 -05:00
Brad King 4e44cbc673 Merge topic 'ninja-multi-default-config-fix' 
1844be451e Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4331
 2020-02-07 09:26:37 -05:00
Brad King 135378fd18 Merge topic 'ninja-multi-default-config-fix' into release-3.17 
1844be451e Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4331
 2020-02-07 09:26:36 -05:00
Brad King b3fd1bcfa5 Merge branch 'release-3.17' 2020-02-07 09:17:27 -05:00
Brad King 92faf1aeb4 Merge topic 'ninja-multi-no-minsizerel' into release-3.17 
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
 2020-02-07 09:17:26 -05:00
Brad King 6c142ac7aa Merge topic 'ninja-multi-no-minsizerel' 
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
 2020-02-07 09:17:26 -05:00
Brad King 737ca8e016 Merge branch 'release-3.17' 2020-02-07 09:15:46 -05:00
Brad King 24e0781c51 Merge topic 'cuda_toolkit_add_cupti' 
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
 2020-02-07 09:15:46 -05:00
Brad King 6d7d0d2446 Merge topic 'cuda_toolkit_add_cupti' into release-3.17 
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
 2020-02-07 09:15:45 -05:00
Kitware Robot 006aff6f87 CMake Nightly Date Stamp 2020-02-07 00:01:09 -05:00
Brad King 3eae0aabd2 Merge branch 'libarchive-win-codepage' into release-3.16 
Merge-request: !4332
 2020-02-06 15:06:12 -05:00
Brad King 16e31523ba libarchive: Add support for UTF-8 locale on Windows 
Backport libarchive upstream commit `c46e7993` (windows: Support UTF-8
locale, 2018-07-23, v3.4.0~105^2).

Fixes: #20320
 2020-02-06 15:04:47 -05:00
Brad King f7c54d2049 libarchive: Fix WideCharToMultiByte output buffer size 
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.
 2020-02-06 15:04:47 -05:00
Kyle Edwards 1844be451e Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG 
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.
 2020-02-06 14:31:13 -05:00
Code Smith 9a71fa46e7 cmake-gui: set generator field defaults from environment 
Fixes: #20251
 2020-02-06 11:59:08 -05:00
Kyle Edwards 9e219de4fb Ninja Multi-Config: Don't include MinSizeRel by default 2020-02-06 11:07:38 -05:00
Brad King 36926f5b8b Merge topic 'cmakefiles-rules-ninja' 
65679ed8d9 Ninja: Move rules.ninja into CMakeFiles

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4328
 2020-02-06 10:11:58 -05:00
Robert Maynard 27b0d908d4 CUDAToolkit: Add support for cupti library 
Fixes: #20318
 2020-02-06 09:41:24 -05:00
Robert Maynard c3d7f2e43b CUDAToolkit: Correct location of OpenCL doc link 2020-02-06 09:40:30 -05:00
Kitware Robot 6b659b0abd CMake Nightly Date Stamp 2020-02-06 00:01:11 -05:00
Kyle Edwards 65679ed8d9 Ninja: Move rules.ninja into CMakeFiles 
Since this is an implementation detail, it should not be user-
visible. Move it into the implementation directory.
 2020-02-05 13:52:54 -05:00
Brad King b49e5344e7 Begin post-3.17 development 2020-02-05 11:39:33 -05:00
Brad King 0cccec23ca Merge branch 'release-3.17' 2020-02-05 11:38:56 -05:00
Brad King 13ef3285df Begin 3.17 release versioning 2020-02-05 11:37:19 -05:00
Brad King 8aa0a3dddd Help: Drop development topic notes to prepare release 
Release versions do not have the development topic section of
the CMake Release Notes index page.
 2020-02-05 11:36:17 -05:00
Brad King 155540d89e Merge topic 'doc-3.17-relnotes' 
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
 2020-02-05 11:34:21 -05:00
Brad King 730a53ef1d Help: Organize and revise 3.17 release notes 
Add section headers similar to the 3.16 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
 2020-02-05 10:36:11 -05:00
Brad King ad33da76b1 Help: Consolidate 3.17 release notes 
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.17.rst`.
 2020-02-05 10:36:11 -05:00
Brad King 2911e637ea Merge branch 'release-3.16' 2020-02-05 10:31:42 -05:00
Brad King 44b8937b76 CMake 3.16.4 v3.16.4 2020-02-05 09:19:24 -05:00
Brad King 56ddef613d Merge topic 'ninja-multi-cmake-build-no-config' 
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
 2020-02-05 09:11:10 -05:00
Brad King 94be195a54 Merge topic 'llvm-rc-preprocess' 
1c2d031cbd Add -E cmake_llvm_rc to preprocess files for llvm-rc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4219
 2020-02-05 09:10:16 -05:00
Brad King 12a72ba71a Merge topic 'typo' 
878a096914 Help: Fix typo in Help/prop_tgt/OSX_COMPATIBILITY_VERSION.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4325
 2020-02-05 09:09:02 -05:00
Brad King b27004231d Merge topic 'sdcc-no-default-target' 
18d2e6fc8f SDCC: Remove default flags for a specific target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4321
 2020-02-05 09:08:13 -05:00
Brad King 85042429b9 Merge branch 'release-3.16' 2020-02-05 08:33:51 -05:00
Brad King 4b1a6a4722 Merge topic 'vs-version-for-unity' into release-3.16 
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
 2020-02-05 08:33:50 -05:00
Brad King 4b062c77b3 Merge topic 'vs-version-for-unity' 
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
 2020-02-05 08:33:50 -05:00