summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'doc-3.17-relnotes'Brad King2020-02-0562-394/+317
|\
| * Help: Organize and revise 3.17 release notesBrad King2020-02-051-184/+218
| * Help: Consolidate 3.17 release notesBrad King2020-02-0562-394/+283
|/
* 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
|\ \
| * | 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
| * | Refactor: Allow generators to decide default configuration for buildKyle Edwards2020-02-044-3/+21
* | | Merge topic 'llvm-rc-preprocess'Brad King2020-02-0512-0/+169
|\ \ \
| * | | Add -E cmake_llvm_rc to preprocess files for llvm-rcThomas Bernard2020-02-0412-0/+169
* | | | Merge topic 'typo'Brad King2020-02-051-1/+1
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | SDCC: Remove default flags for a specific targetfruit2020-02-042-11/+5
* | | | | | 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
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'vs-version-for-unity'Brad King2020-02-053-7/+12
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | VS: Do not use native unity builds on VS 2017 versions less than 15.8Brad King2020-02-043-7/+12
* | | | | | | 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
|\ \ \ \ \ \
| * | | | | | CUDA: Do not treat CUDA toolkit include directories as implicitRobert Maynard2020-02-031-0/+12
* | | | | | | Merge topic 'compiler-abi-no-Werror'Brad King2020-02-041-0/+3
|\ \ \ \ \ \ \
| * | | | | | | CMakeDetermineCompilerABI: Avoid failing on warnings with -WerrorDavid Rohr2020-02-031-0/+3
| |/ / / / / /
* | | | | | | Merge topic 'ninja-run-tool-in-builddir'Brad King2020-02-041-0/+2
|\ \ \ \ \ \ \
| * | | | | | | cmGlobalNinjaGenerator: run ninja tools in the build directoryBen Boeckel2020-02-031-0/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'swift-exe-exports'Brad King2020-02-042-4/+13
|\ \ \ \ \ \ \
| * | | | | | | Ninja: properly handle exports from Swift exesSaleem Abdulrasool2020-02-022-4/+13
* | | | | | | | 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
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'android-ndk-r19-binutils'Brad King2020-02-041-0/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Android: Fix binutils selection with NDK r19+ unified toolchainBrad King2020-02-031-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-02-041-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'ninja-multi-variable-shuffle'Brad King2020-02-0332-172/+455
|\ \ \ \ \ \
| * | | | | | Ninja Multi-Config: Shuffle variables aroundKyle Edwards2020-02-0332-172/+455
* | | | | | | Merge topic 'ctest-add-ignore-no-tests-option'Kyle Edwards2020-02-0316-1/+94
|\ \ \ \ \ \ \
| * | | | | | | Add --no-tests=<[error|ignore]> option to CTestStefan Dinkelacker2020-01-3116-1/+94
* | | | | | | | Merge topic 'bootstrap-c++-features'Brad King2020-02-031-0/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix AUTOMOC deps file to contain correct rule nameAlexandru Croitor2020-01-311-1/+8
* | | | | | | | | | Merge topic 'windows-gnu-asm'Brad King2020-02-038-18/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Tests: Update Assembler code generation to select MSVC runtime libraryBrad King2020-01-311-2/+6
| * | | | | | | | | | ASM: Hook up Windows-specific GNU/Clang compiler information modulesMartin Storsjö2020-01-317-16/+28
| |/ / / / / / / / /
* | | | | | | | | | Merge topic '7zip-fix'Brad King2020-02-031-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cmArchiveWrite: Remove ./ suffix from 7zip archivesCristian Adam2020-01-311-2/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'ninja_multi_config_test_understand_win_cuda'Brad King2020-02-032-0/+6
|\ \ \ \ \ \ \ \ \ \