summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge topic 'ninja-compile_commands.json'Brad King2017-05-181-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Ninja: List compile_commands.json as generated by CMakeKevin Puetz2017-05-161-0/+4
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'removeSetModulePath'Brad King2017-05-184-12/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Tests: Remove unnecessary setting of CMAKE_MODULE_PATHCraig Scott2017-05-154-12/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'gtest_add_tests'Brad King2017-05-1811-27/+302
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | GoogleTest: Expand capabilities of gtest_add_tests()Craig Scott2017-05-1511-27/+302
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'update-libuv'Brad King2017-05-1848-710/+964
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | libuv: Update build within CMakeBrad King2017-05-161-0/+7
| * | | | | | | | | | Merge branch 'upstream-libuv' into update-libuvBrad King2017-05-1547-710/+957
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | libuv 2017-05-09 (e11dcd43)libuv upstream2017-05-1547-711/+957
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-05-181-1/+1
* | | | | | | | | | | | Merge topic 'note-unstage-before-update'Brad King2017-05-171-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Help/dev: note that unstaging before an update is unnecessaryBen Boeckel2017-05-171-0/+4
|/ / / / / / / / / / /
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-05-171-1/+1
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'release'Brad King2017-05-160-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'mingw-w64-compile' into releaseBrad King2017-05-152-0/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'vs_fix_cpp_debugging_with_cs_enabled' into releaseBrad King2017-05-151-11/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'FindOpenSSL-crypto-only' into releaseBrad King2017-05-151-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'FindDevIL-compat' into releaseBrad King2017-05-151-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'xcode-try_compile-scheme'Brad King2017-05-161-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Xcode: Work around xcodebuild spurious hangs in try_compileBrad King2017-05-151-1/+2
| * | | | | | | | | | | | | Xcode: Refactor internal decision for scheme generationBrad King2017-05-151-4/+5
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'early-config-name'Brad King2017-05-164-13/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on constructionBrad King2017-05-154-13/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge topic 'cpackifw-i18n'Brad King2017-05-166-25/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | CPackIFW: Internationalization SupportKonstantin Podsvirov2017-05-126-25/+145
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'extra-fphsa-space'Brad King2017-05-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | FPHSA: remove extra spaceBen Boeckel2017-05-151-2/+2
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'GNU-FindBinUtils-patterns'Brad King2017-05-161-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | GCC: more patterns for ar/ranlibRuslan Baratov2017-05-141-2/+10
* | | | | | | | | | | | | | Merge topic 'mingw-w64-compile'Brad King2017-05-162-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | cmFileCommand: Fix build on mingw-w64Aleksey Chernov2017-05-151-0/+4
| * | | | | | | | | | | | | bootstrap: fix build on mingw-w64Aleksey Chernov2017-05-151-0/+1
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'vs_fix_cpp_debugging_with_cs_enabled'Brad King2017-05-161-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | VS: Fix debugging of C++ executables if CSharp is enabledMichael Stürmer2017-05-151-11/+11
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge topic 'FindOpenSSL-crypto-only'Brad King2017-05-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | FindOpenSSL: Restore support for crypto-only resultBrad King2017-05-151-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'FindDevIL-compat'Brad King2017-05-161-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | FindDevIL: Restore IL_FOUND result variableBrad King2017-05-151-1/+3
| |/ / / / / / / /
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-05-161-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge topic 'fix-target-alias-doc-typo'Brad King2017-05-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Help: Fix typo in add_library(... ALIAS ...) textGregor Jasny2017-05-141-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'autogen_settings'Brad King2017-05-151-14/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Autogen: Add -DWIN32 to definitions list on demandSebastian Holtermann2017-05-131-6/+8
| * | | | | | | | Autogen: Include moc/uic/rcc binary in settings hashSebastian Holtermann2017-05-131-8/+15
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge topic 'cpack-components-handle-symlinks'Brad King2017-05-159-4/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | CPack test symlinks in packageDomen Vrankar2017-05-145-0/+59
| * | | | | | | | CPack unify component/monolithic package symlink handlingDomen Vrankar2017-05-141-0/+1
| * | | | | | | | Improved CPack tests error loggingDomen Vrankar2017-05-143-4/+6
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'FindPkgConfig-fix-lib-search'Brad King2017-05-151-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |