summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'ninja_cuda_export_compile_commands_support'Brad King2017-07-142-7/+24
|\
| * CUDA: CMAKE_EXPORT_COMPILE_COMMANDS now works with CUDA and NinjaRobert Maynard2017-07-132-7/+24
* | Merge topic 'vs_csharp_add_custom_command_comment'Brad King2017-07-141-1/+5
|\ \
| * | VS: print comment in CSharp target only if it is actually setMichael Stürmer2017-07-121-1/+5
* | | Merge topic 'CMakePushCheckState-fix-RESET'Brad King2017-07-142-1/+23
|\ \ \
| * | | CMakePushCheckState: Fix cmake_push_check_state RESET argumentBrad King2017-07-122-1/+23
* | | | CMake Nightly Date StampKitware Robot2017-07-141-1/+1
* | | | Merge branch 'release-3.9'Brad King2017-07-130-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'android-system-include-last' into release-3.9Brad King2017-07-137-13/+45
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge topic 'android-system-include-last'Brad King2017-07-137-13/+45
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Android: Always add standard include directories lastBrad King2017-07-137-13/+45
| |/ / /
* | | | Merge topic 'win10-sdk-request-mismatch'Brad King2017-07-131-0/+7
|\ \ \ \
| * | | | cmGlobalVisualStudio14Generator: notify when the SDK version doesn't matchBen Boeckel2017-07-131-0/+7
| | |/ / | |/| |
* | | | Merge topic 'FindProtobuf-protoc-target'Brad King2017-07-132-4/+18
|\ \ \ \
| * | | | FindProtobuf: add target for protocAndré Apitzsch2017-07-122-4/+18
* | | | | Merge topic 'better-exception-reporting'Brad King2017-07-135-14/+26
|\ \ \ \ \
| * | | | | CTest: Report more detail about system exceptions in testsBill Hoffman2017-07-125-14/+26
| | |/ / / | |/| | |
* | | | | Merge topic 'test_include_files'Brad King2017-07-1312-2/+109
|\ \ \ \ \
| * | | | | Add TEST_INCLUDE_DIR[S] unit testMatthew Woehlke2017-07-127-0/+79
| * | | | | Add TEST_INCLUDE_FILESMatthew Woehlke2017-07-125-2/+30
* | | | | | Merge topic 'labels-for-subprojects'Brad King2017-07-1357-17/+885
|\ \ \ \ \ \
| * | | | | | Help: Add notes for topic 'labels_for_subprojects'Betsy McPhail2017-07-101-0/+14
| * | | | | | Add tests for new directory labels and labels-for-subprojects featuresBetsy McPhail2017-07-1032-0/+483
| * | | | | | Display subproject timing summaryBetsy McPhail2017-07-106-1/+102
| * | | | | | Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variableBetsy McPhail2017-07-1011-14/+194
| * | | | | | Add CTEST_LABELS_FOR_SUBPROJECTS as a CTest module and script variableBetsy McPhail2017-07-1015-2/+92
* | | | | | | Merge topic 'ninja-dyndep-response-file'Brad King2017-07-131-8/+2
|\ \ \ \ \ \ \
| * | | | | | | Ninja: always use response file for cmake_ninja_dyndepYurii Batrak2017-07-101-8/+2
* | | | | | | | Merge topic 'server-target-backtraces'Brad King2017-07-135-21/+116
|\ \ \ \ \ \ \ \
| * | | | | | | | server: Report backtraces in codemodel responseIvan Shcherbakov2017-07-113-2/+97
| * | | | | | | | server: Rename cmServerProtocol1_0 to cmServerProtocol1Ivan Shcherbakov2017-07-063-19/+19
* | | | | | | | | Merge topic 'source-group-regex-tweaks'Brad King2017-07-132-4/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add more extensions to Resources source group by defaultUfoXp2017-07-102-4/+8
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-07-131-1/+1
* | | | | | | | | | Merge branch 'release-3.8'Brad King2017-07-120-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-ep-log-no-extract-fix' into release-3.8Brad King2017-07-122-3/+12
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | ExternalProject: only append `COMMAND` if actually adding a commandBen Boeckel2017-07-122-3/+12
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'release-3.9'Brad King2017-07-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | CMake 3.9.0-rc6v3.9.0-rc6Brad King2017-07-121-1/+1
* | | | | | | | | | Merge branch 'release-3.9'Brad King2017-07-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'android-fix-c++_shared' into release-3.9Brad King2017-07-121-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'vs-2017-sln-guid' into release-3.9Brad King2017-07-1113-12/+37
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'find_package-root-prefix-path-suffixes' into release-3.9Brad King2017-07-1111-18/+75
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bindexplib-revert-consts' into release-3.9Brad King2017-07-103-22/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'android-fix-c++_shared'Brad King2017-07-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Android: Link to android_support with c++_sharedBrad King2017-07-121-0/+1
* | | | | | | | | | | | | | Merge topic 'vs-2017-sln-guid'Brad King2017-07-1213-12/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | VS: Add SolutionGuid to generated .sln filesBrad King2017-07-1113-12/+37
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge topic 'find_package-root-prefix-path-suffixes'Brad King2017-07-1211-18/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | find_*: Honor PATH_SUFFIXES in PackageName_ROOT pathsBrad King2017-07-119-0/+74