summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'project-commands'Brad King2018-10-2545-103/+108
|\
| * Help: Apply syntax highlighting to project commandsJoachim Wuttke (o)2018-10-2545-103/+108
* | Merge branch 'release-3.13'Brad King2018-10-250-0/+0
|\ \
| * | CMake 3.13.0-rc2v3.13.0-rc2Brad King2018-10-251-1/+1
* | | Merge branch 'release-3.13'Brad King2018-10-250-0/+0
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch 'FindBoost-1.69' into release-3.13Brad King2018-10-251-14/+29
| |\
| * \ Merge branch 'cmake-gui-vs-open-space' into release-3.13Brad King2018-10-251-2/+3
| |\ \
* | \ \ Merge topic 'FindBoost-1.69'Brad King2018-10-251-14/+29
|\ \ \ \ | | |_|/ | |/| |
| * | | FindBoost: Add support for upcoming Boost 1.69Mateusz Łoskot2018-10-251-14/+29
* | | | Merge topic 'cmake-gui-vs-open-space'Brad King2018-10-251-2/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | cmake-gui: Fix "Open Project" for VS IDE with space in pathBrad King2018-10-251-2/+3
| |/ /
* | | Merge branch 'release-3.13'Brad King2018-10-250-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'fix-no-testing' into release-3.13Brad King2018-10-242-4/+5
| |\ \
| * \ \ Merge branch 'cuda-thread-flags' into release-3.13Brad King2018-10-249-18/+94
| |\ \ \
| * \ \ \ Merge branch 'tar-warnings' into release-3.13Brad King2018-10-241-13/+31
| |\ \ \ \
* | \ \ \ \ Merge branch 'release-3.12'Brad King2018-10-250-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'tar-warnings' into release-3.12Brad King2018-10-241-13/+31
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'cuda-filter-device-link-items' into release-3.12Brad King2018-10-241-1/+18
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'cuda-thread-flags'Brad King2018-10-259-18/+94
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | CUDA: Add test for device linking when host linking uses threadsRobert Maynard2018-10-247-16/+73
| * | | | | | | FindThreads: Pass -pthread to CUDA compiler through -XcompilerRolf Eike Beer2018-10-241-1/+3
| * | | | | | | Merge branch 'cuda-filter-device-link-items' into cuda-thread-flagsBrad King2018-10-241-1/+18
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | CUDA: Filter out host link flags during device linkingRobert Maynard2018-10-241-1/+18
* | | | | | | | Merge topic 'tar-warnings'Brad King2018-10-251-13/+31
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | cmake: Distinguish '-E tar' warnings from errors copying dataBrad King2018-10-241-13/+31
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'fix-no-testing'Brad King2018-10-252-4/+5
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Tests: Add missing BUILD_TESTING conditionsBrad King2018-10-242-4/+5
* | | | | | | CMake Nightly Date StampKitware Robot2018-10-251-1/+1
* | | | | | | Merge branch 'release-3.13'Brad King2018-10-240-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'vs-csharp-win32-flags' into release-3.13Brad King2018-10-235-10/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'vs-csharp-in-custom-target' into release-3.13Brad King2018-10-234-0/+7
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge topic 'vs-csharp-win32-flags'Brad King2018-10-245-10/+10
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | VS: Fix CSharp support for win32res: and win32icon: flagsBrad King2018-10-235-10/+10
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'vs-csharp-in-custom-target'Brad King2018-10-244-0/+7
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | VS: Fix crash on CSharp sources in a custom targetBrad King2018-10-234-0/+7
| |/ / / / /
* | | | | | Merge topic 'scripting-commands'Brad King2018-10-2441-319/+472
|\ \ \ \ \ \
| * | | | | | Help: Revise docs on Scripting CommandsJoachim Wuttke (l)2018-10-2341-319/+472
* | | | | | | CMake Nightly Date StampKitware Robot2018-10-241-1/+1
* | | | | | | Merge topic 'rst-block-comments'Brad King2018-10-23202-9868/+10078
|\ \ \ \ \ \ \
| * | | | | | | Utilities/Scripts: Remove temporary block-style comment conversion scriptKyle Edwards2018-10-221-33/+0
| * | | | | | | Help: Convert remaining modules to block-style commentsKitware Robot2018-10-22202-9868/+10078
| * | | | | | | Utilities/Scripts: Add temporary block-style comment conversion scriptKyle Edwards2018-10-221-0/+33
* | | | | | | | Merge branch 'release-3.13'Brad King2018-10-230-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'GNUInstallDirs-kfreebsd-man' into release-3.13Brad King2018-10-222-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'update-curl' into release-3.13Brad King2018-10-22114-1859/+2568
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'curl-ssize_t' into release-3.13Brad King2018-10-221-0/+6
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'GNUInstallDirs-kfreebsd-man'Brad King2018-10-232-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSDJames Clarke2018-10-222-2/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge topic 'update-curl'Brad King2018-10-23114-1859/+2568
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | curl: Update build within CMake to account for 7.61 changesBrad King2018-10-222-2/+1