summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'ctest-resource-fixes'Brad King2019-11-2647-2/+282
|\
| * Help: Clarify how tests are run if no resource spec file is specifiedKyle Edwards2019-11-261-0/+17
| * CTest: Clarify that resource requirements can be splitKyle Edwards2019-11-2510-2/+41
| * CTest: Add version field to resource spec fileKyle Edwards2019-11-2537-0/+224
* | Merge branch 'release-3.15'Brad King2019-11-260-0/+0
|\ \
| * \ Merge branch 'backport-implicit-includes-extra-CR' into release-3.15Brad King2019-11-261-1/+1
| |\ \
* | \ \ Merge branch 'release-3.16'Brad King2019-11-260-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'implicit-includes-extra-CR' into release-3.16Brad King2019-11-261-1/+1
| |\ \ \ \
* | \ \ \ \ Merge topic 'implicit-includes-extra-CR'Brad King2019-11-261-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-ext...Brad King2019-11-261-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler outputBrad King2019-11-251-1/+1
* | | | | | Merge branch 'release-3.16'Brad King2019-11-260-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'FindODBC-mingw' into release-3.16Brad King2019-11-261-0/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'FindODBC-mingw'Brad King2019-11-261-0/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | FindODBC: Add library name for MinGW toolchainsCristian Adam2019-11-251-0/+2
* | | | | | | Merge branch 'release-3.16'Brad King2019-11-260-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'unity-no-duplicate-path' into release-3.16Brad King2019-11-261-13/+16
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'unity-no-duplicate-path'Brad King2019-11-261-13/+16
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Unity: No repeated path for internal generated unity filesCristian Adam2019-11-251-13/+16
| | |/ / / / | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-11-261-1/+1
* | | | | | Merge topic 'git-var'Brad King2019-11-251-4/+4
|\ \ \ \ \ \
| * | | | | | setup-user: switch to git-var to check if username and e-mail are setArkadiusz Drabczyk2019-11-241-4/+4
* | | | | | | Merge branch 'release-3.16'Brad King2019-11-250-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'FindwxWidgets-rel-and-dbg' into release-3.16Brad King2019-11-251-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'FindwxWidgets-rel-and-dbg'Brad King2019-11-251-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | FindwxWidgets: Fix finding both release and debug libsBrad King2019-11-221-1/+1
* | | | | | | CMake Nightly Date StampKitware Robot2019-11-251-1/+1
| |_|/ / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-11-241-1/+1
* | | | | | CMake Nightly Date StampKitware Robot2019-11-231-1/+1
* | | | | | CMake Nightly Date StampKitware Robot2019-11-221-1/+1
* | | | | | Merge branch 'release-3.16'Brad King2019-11-210-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'xcode-objc' into release-3.16Brad King2019-11-211-0/+4
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'xcode-objc'Brad King2019-11-211-0/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Xcode: Set source file type for Objective C/C++Brad King2019-11-201-0/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'ccmake_fix_help_text_crash'Brad King2019-11-212-86/+43
|\ \ \ \ \ \
| * | | | | | ccmake: Fix crash with cache entries almost the size of the windowSylvain Joubert2019-11-192-86/+43
* | | | | | | Merge topic 'FindMPI-improve-error'Brad King2019-11-211-0/+2
|\ \ \ \ \ \ \
| * | | | | | | FindMPI: Improve error when a component's language is not enabledKeith Ballard2019-11-201-0/+2
* | | | | | | | Merge topic 'UseJava-javadoc-classpath-separator'Brad King2019-11-211-43/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | UseJava: Use correct path separator in javadocNathan Burles2019-11-201-20/+4
| * | | | | | | | UseJava: Use list(APPEND) to simplify javadoc option constructionNathan Burles2019-11-201-10/+11
| * | | | | | | | UseJava: Extract the path separator to module levelNathan Burles2019-11-201-15/+10
| |/ / / / / / /
* | | | | | | | Merge topic 'ExternalProject-list-sep-in-cache'Brad King2019-11-211-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | ExternalProject: replace LIST_SEPARATOR in initial cache files tooBen Boeckel2019-11-201-0/+5
| |/ / / / / / /
* | | | | | | | Merge topic 'load_cache_in_script'Brad King2019-11-2111-2/+79
|\ \ \ \ \ \ \ \
| * | | | | | | | load_cache: Allow READ_WITH_PREFIX mode in cmake scriptsCharles Barto2019-11-1911-2/+79
* | | | | | | | | Merge topic 'fileapi-multi-config'Brad King2019-11-214-2/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | FileAPI: Add "multiConfig" parameter to index fileKyle Edwards2019-11-204-2/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-210-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'FindwxWidgets-qt-debug' into release-3.16Brad King2019-11-211-0/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |