summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'doc-updates' into release-3.13Brad King2018-10-264-7/+19
|\
| * Help: clarify "LINKER:" prefix usageMarc Chevrier2018-10-264-7/+19
* | Merge branch 'FindMPI-pthread-cuda' into release-3.13Brad King2018-10-251-1/+6
|\ \
| * | FindMPI: Pass -pthread to CUDA compiler through -XcompilerBrad King2018-10-251-1/+6
* | | CMake 3.13.0-rc2v3.13.0-rc2Brad King2018-10-251-1/+1
* | | Merge branch 'FindBoost-1.69' into release-3.13Brad King2018-10-251-14/+29
|\ \ \
| * | | FindBoost: Add support for upcoming Boost 1.69Mateusz Łoskot2018-10-251-14/+29
| | |/ | |/|
* | | Merge branch 'cmake-gui-vs-open-space' into release-3.13Brad King2018-10-251-2/+3
|\ \ \
| * | | cmake-gui: Fix "Open Project" for VS IDE with space in pathBrad King2018-10-251-2/+3
| |/ /
* | | Merge branch 'fix-no-testing' into release-3.13Brad King2018-10-242-4/+5
|\ \ \ | |_|/ |/| |
| * | Tests: Add missing BUILD_TESTING conditionsBrad King2018-10-242-4/+5
* | | Merge branch 'cuda-thread-flags' into release-3.13Brad King2018-10-249-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 branch 'tar-warnings' into release-3.13Brad King2018-10-241-13/+31
|\ \ \ \ \
| * | | | | cmake: Distinguish '-E tar' warnings from errors copying dataBrad King2018-10-241-13/+31
| | |/ / / | |/| | |
* | | | | Merge branch 'vs-csharp-win32-flags' into release-3.13Brad King2018-10-235-10/+10
|\ \ \ \ \
| * | | | | VS: Fix CSharp support for win32res: and win32icon: flagsBrad King2018-10-235-10/+10
| | |_|_|/ | |/| | |
* | | | | Merge branch 'vs-csharp-in-custom-target' into release-3.13Brad King2018-10-234-0/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | VS: Fix crash on CSharp sources in a custom targetBrad King2018-10-234-0/+7
| |/ / /
* | | | Merge branch 'GNUInstallDirs-kfreebsd-man' into release-3.13Brad King2018-10-222-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSDJames Clarke2018-10-222-2/+2
| |/ /
* | | Merge branch 'update-curl' into release-3.13Brad King2018-10-22114-1859/+2568
|\ \ \
| * | | curl: Update build within CMake to account for 7.61 changesBrad King2018-10-222-2/+1
| * | | curl: Backport to work with CMake 3.1 againBrad King2018-10-221-2/+3
| * | | Merge branch 'upstream-curl' into update-curlBrad King2018-10-22112-1858/+2567
| |\ \ \
| | * | | curl 2018-09-04 (432eb5f5)Curl Upstream2018-10-22112-1865/+2573
| * | | | curl: Update script to get curl 7.61.1Brad King2018-10-221-1/+1
| | |/ / | |/| |
* | | | Merge branch 'curl-ssize_t' into release-3.13Brad King2018-10-221-0/+6
|\ \ \ \
| * | | | curl: add missing type sizes for 'long long' and '__int64'Brad King2018-10-221-0/+6
| |/ / /
* | | | Merge branch 'update-kwsys' into release-3.13Brad King2018-10-192-1/+6
|\ \ \ \
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-10-192-1/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | KWSys 2018-10-19 (c2f29d2e)KWSys Upstream2018-10-192-1/+6
* | | | | Merge branch 'deployqt4-cmp0080-fix' into release-3.13Brad King2018-10-192-368/+384
|\ \ \ \ \
| * | | | | DeployQt4: Do not include BundleUtilities at configure timeKyle Edwards2018-10-192-71/+86
| * | | | | DeployQt4: Convert to 2-space indentationKyle Edwards2018-10-181-259/+259
| * | | | | Help: Convert DeployQt4 to block-style commentKyle Edwards2018-10-181-100/+101
* | | | | | Merge branch 'doc-target_link_libraries-item-quoting' into release-3.13Brad King2018-10-181-0/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Help: Clarify command-line encoding of target_link_libraries itemsBrad King2018-10-181-0/+12
* | | | | | Merge branch 'update-vim-syntax' into release-3.13Brad King2018-10-182-106/+2148
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntaxBrad King2018-10-182-106/+2148
| |\ \ \ \ \ \
| | * | | | | | vim-cmake-syntax 2018-10-18 (64ff4bd7)vim-cmake-syntax upstream2018-10-182-106/+2148
* | | | | | | | Merge branch 'rel-doc-qthelp' into release-3.13Brad King2018-10-182-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Utilities/Release: Add qthelp docs to binary archivesBrad King2018-10-172-1/+4
* | | | | | | | | Merge branch 'revert-server-iface-sources' into release-3.13Brad King2018-10-184-189/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cmake-server: Revert "Support codemodel filegroups for INTERFACE_SOURCES"Brad King2018-10-174-189/+40
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'document-dollar-in-varnames' into release-3.13Brad King2018-10-168-2/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | CMP0053: document that `$` is a valid literal variable characterBen Boeckel2018-10-158-2/+48
| |/ / / / / / / /