summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | \ \ \ \ \ \ \ Merge topic 'android-ndk-r19-binutils'Brad 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
| * | | | | | | Android: Fix binutils selection with NDK r19+ unified toolchainBrad King2020-02-031-0/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | CMake Nightly Date StampKitware Robot2020-02-041-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'ninja-multi-variable-shuffle'Brad King2020-02-0332-172/+455
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b966f86d86 Ninja Multi-Config: Shuffle variables around Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4305
| * | | | | | Ninja Multi-Config: Shuffle variables aroundKyle Edwards2020-02-0332-172/+455
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant variable CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE. Rename other variables. Document and improve handling of error conditions.
* | | | | | | Merge topic 'ctest-add-ignore-no-tests-option'Kyle Edwards2020-02-0316-1/+94
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a39d4139d0 Add --no-tests=<[error|ignore]> option to CTest Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4258
| * | | | | | | Add --no-tests=<[error|ignore]> option to CTestStefan Dinkelacker2020-01-3116-1/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no tests were found, the default behavior of CTest is to always log an error message but to return an error code in script mode only. This option unifies the behavior of CTest by either returning an error code if no tests were found or by ignoring it. Signed-off-by: Stefan Dinkelacker <s.dinkelacker@dkfz-heidelberg.de>
* | | | | | | | Merge topic 'bootstrap-c++-features'Brad King2020-02-031-0/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2834f3355d Bootstrap: take care of C++ features configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4301
| * | | | | | | | Bootstrap: take care of C++ features configurationMarc Chevrier2020-02-011-0/+24
| | | | | | | | |
* | | | | | | | | Merge topic 'fix_automoc_deps_rule_name'Brad King2020-02-031-1/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c664bb5b9 Fix AUTOMOC deps file to contain correct rule name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4313
| * | | | | | | | | Fix AUTOMOC deps file to contain correct rule nameAlexandru Croitor2020-01-311-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rule name should include the current binary path relative to the top level binary path. Fixes: #20298
* | | | | | | | | | Merge topic 'windows-gnu-asm'Brad King2020-02-038-18/+34
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Tests: Update Assembler code generation to select MSVC runtime libraryBrad King2020-01-311-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Assembler` test runs the C compiler in a custom command to generate a `.s` file for the platform. When using the GNU-like Clang variant on Windows, ensure that the custom command includes the MSVC runtime library selection flags for Clang. That way the resulting `.s` file, when assembled into a `.obj`, will tell the linker what runtime library it needs.
| * | | | | | | | | | ASM: Hook up Windows-specific GNU/Clang compiler information modulesMartin Storsjö2020-01-317-16/+28
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows building .s/.S assembly code, and makes sure that the `-fPIC` option isn't passed to the compiler (as it errors out on Clang and causes a loud warning on GCC).
* | | | | | | | | | Merge topic '7zip-fix'Brad King2020-02-031-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34413cbf3f cmArchiveWrite: Remove ./ suffix from 7zip archives Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4311
| * | | | | | | | | | cmArchiveWrite: Remove ./ suffix from 7zip archivesCristian Adam2020-01-311-2/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20297
* | | | | | | | | | Merge topic 'ninja_multi_config_test_understand_win_cuda'Brad King2020-02-032-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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