mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 05:11:15 -06:00
Code Issues Packages Projects Releases Wiki Activity
46,709 Commits 2 Branches 385 Tags
0ba8010255b8d2e2efcd2d0fe454cdee0be902e2
Commit Graph

46709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charis Marangos
0ba8010255 ExternalProject: Fix git submodule recursion on update 
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
 2020-02-11 10:14:42 +11: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
David Rohr
d5895f50c3 CMakeDetermineCompilerABI: Avoid failing on warnings with -Werror 
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
 2020-02-03 17:01:35 -05:00
Ben Boeckel
f4e02c46fc cmGlobalNinjaGenerator: run ninja tools in the build directory 
Fixes: #20303
 2020-02-03 15:31:26 -05:00
Robert Maynard
87df637078 CUDA: Do not treat CUDA toolkit include directories as implicit 
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
 2020-02-03 14:59:26 -05:00
Brad King
e3d3b7ddeb Android: Fix binutils selection with NDK r19+ unified toolchain 
In commit 97bca2f9fa (Android: Use unified toolchain in NDK r19+,
2019-07-26, v3.16.0-rc1~342^2) we hard-coded use of the unified
toolchain for NDK r19+ and skipped most of the old detection logic.
However, in that fast path we left out setting `_CMAKE_TOOLCHAIN_PREFIX`
for `CMakeFindBinutils` to select the matching binutils.  Add it.

Fixes: #20038
 2020-02-03 14:35:12 -05:00
Brad King
5f04dfe57e Merge topic 'ninja-multi-variable-shuffle' 
b966f86d86 Ninja Multi-Config: Shuffle variables around

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4305
 2020-02-03 14:00:03 -05:00
Kyle Edwards
b966f86d86 Ninja Multi-Config: Shuffle variables around 
Remove redundant variable CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE.
Rename other variables. Document and improve handling of error
conditions.
 2020-02-03 13:27:51 -05:00
Kyle Edwards
25bf64eca6 Merge topic 'ctest-add-ignore-no-tests-option' 
a39d4139d0 Add --no-tests=<[error|ignore]> option to CTest

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4258
 2020-02-03 13:22:02 -05:00
Brad King
dfd7ca0d99 Merge topic 'bootstrap-c++-features' 
2834f3355d Bootstrap: take care of C++ features configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4301
 2020-02-03 11:55:19 -05:00
Brad King
16d91cbf7e Merge topic 'fix_automoc_deps_rule_name' 
7c664bb5b9 Fix AUTOMOC deps file to contain correct rule name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4313
 2020-02-03 11:53:28 -05:00
Brad King
b81aef19de Merge topic 'windows-gnu-asm' 
97de48b528 Tests: Update Assembler code generation to select MSVC runtime library
6348ffb9e5 ASM: Hook up Windows-specific GNU/Clang compiler information modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4287
 2020-02-03 11:51:34 -05:00
Brad King
a19bc6ae39 Merge topic '7zip-fix' 
34413cbf3f cmArchiveWrite: Remove ./ suffix from 7zip archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4311
 2020-02-03 11:49:39 -05:00
Brad King
adf5524689 Merge topic 'ninja_multi_config_test_understand_win_cuda' 
7f39ea3318 NinjaMultiConfig: CUDA executables generate symbols on windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4310
 2020-02-03 11:48:08 -05:00
Brad King
3a17ef5f23 Merge topic 'cpack-deprecate-old-macos-generators' 
2ed00e8ef8 CPack: Deprecate OSXX11 generator
7bf187499f CPack: Deprecate PackageMaker generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4309
 2020-02-03 11:46:01 -05:00
Brad King
ce7be22476 Merge topic 'blas-intel-mkl' 
807a129f3c Find{BLAS,LAPACK}: Include parent of points directory in search
fe86dc43fe Find{BLAS,LAPACK}: Fixed an incorrect use of a macro argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4306
 2020-02-03 11:45:05 -05:00
Brad King
999a8663c5 Merge topic 'aix-no-export-all' 
afcd9fe669 AIX: Add an option to disable automatic exports from shared libraries
67f30811ce AIX: Improve name of internal symbol export list file
0ffd54f094 AIX: Add ExportImportList option to skip the object files
0dcfb63cb9 AIX: Revise ExportImportList to build output more incrementally

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4308
 2020-02-03 11:32:01 -05:00
Brad King
ea5c6c3c86 Merge topic 'clang-tidy-driver-mode' 
3aea865801 clang-tidy: Fix explicit --driver-mode= argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4307
 2020-02-03 11:30:58 -05:00
Brad King
095d50598b Merge topic 'findCUDAToolkit_correct_cudart_static_deps' 
60bb7a54d5 CUDAToolkit: Add required static runtime library dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4294
 2020-02-03 11:29:48 -05:00
Kitware Robot
20eeeeaa1a CMake Nightly Date Stamp 2020-02-03 00:01:05 -05:00