mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 22:59:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
46,877 Commits 2 Branches 401 Tags
c78ae16d81bd5fdc317d3d395978efcfcd6ec6cd
Commit Graph

46877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kitware Robot 9a5fe4e48c CMake Nightly Date Stamp 2020-02-05 00:01:11 -05:00
Kyle Edwards bd4ae2af0f Help: Make note of ninja -f argument in Ninja Multi-Config docs 2020-02-04 14:22:49 -05:00
Kyle Edwards 79e5b3c46a Help: Explain new behavior of cmake --build in Ninja Multi-Config 2020-02-04 14:22:49 -05:00
Kyle Edwards 16a4ba5b31 Ninja Multi-Config: Use build.ninja if cmake --build has no --config 
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.
 2020-02-04 14:13:07 -05:00
Kyle Edwards 2ac835b9f9 Refactor: Allow generators to decide default configuration for build 
And allow them to read any cache values they need.
 2020-02-04 14:13:07 -05:00
Isuru Fernando 878a096914 Help: Fix typo in Help/prop_tgt/OSX_COMPATIBILITY_VERSION.rst 2020-02-04 18:42:22 +00:00
Brad King 9135954e2f VS: Do not use native unity builds on VS 2017 versions less than 15.8 
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
 2020-02-04 11:46:18 -05:00
Brad King 304703fb47 Merge branch 'release-3.15' 2020-02-04 10:29:19 -05:00
Brad King ebea30a1ed CMake 3.15.7 v3.15.7 2020-02-04 09:02:13 -05:00
Brad King 28013c9434 Merge topic 'cuda_remove_toolkit_dirs_from_implicit_includes' 
87df637078 CUDA: Do not treat CUDA toolkit include directories as implicit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4317
 2020-02-04 08:30:12 -05:00
Brad King 37af0fac54 Merge topic 'compiler-abi-no-Werror' 
d5895f50c3 CMakeDetermineCompilerABI: Avoid failing on warnings with -Werror

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4316
 2020-02-04 08:29:30 -05:00
Brad King 8b6b783633 Merge topic 'ninja-run-tool-in-builddir' 
f4e02c46fc cmGlobalNinjaGenerator: run ninja tools in the build directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4319
 2020-02-04 08:28:46 -05:00
Brad King 451ce7e410 Merge topic 'swift-exe-exports' 
1e26d57188 Ninja: properly handle exports from Swift exes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4314
 2020-02-04 08:27:49 -05:00
Brad King d6995226c9 Merge branch 'release-3.16' 2020-02-04 08:26:40 -05:00
Brad King a8bcfddb2b Merge topic 'android-ndk-r19-binutils' 
e3d3b7ddeb Android: Fix binutils selection with NDK r19+ unified toolchain

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4318
 2020-02-04 08:26:40 -05:00
Brad King 24d57c2257 Merge topic 'android-ndk-r19-binutils' into release-3.16 
e3d3b7ddeb Android: Fix binutils selection with NDK r19+ unified toolchain

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4318
 2020-02-04 08:26:39 -05:00
Thomas Bernard 1c2d031cbd Add -E cmake_llvm_rc to preprocess files for llvm-rc 
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.
 2020-02-04 08:19:12 -05:00
fruit 18d2e6fc8f SDCC: Remove default flags for a specific target 
Remove defaults for a specific target (8051) because they are incorrect
for other targets.

Fixes: #20308
 2020-02-04 07:25:24 -05:00
Kitware Robot f9410accaa CMake Nightly Date Stamp 2020-02-04 00:01:10 -05:00