Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tar-warnings' into release-3.13 | Brad King | 2018-10-24 | 1 | -13/+31 |
|\ | |||||
| * | cmake: Distinguish '-E tar' warnings from errors copying data | Brad King | 2018-10-24 | 1 | -13/+31 |
* | | Merge branch 'vs-csharp-win32-flags' into release-3.13 | Brad King | 2018-10-23 | 5 | -10/+10 |
|\ \ | |||||
| * | | VS: Fix CSharp support for win32res: and win32icon: flags | Brad King | 2018-10-23 | 5 | -10/+10 |
* | | | Merge branch 'vs-csharp-in-custom-target' into release-3.13 | Brad King | 2018-10-23 | 4 | -0/+7 |
|\ \ \ | |||||
| * | | | VS: Fix crash on CSharp sources in a custom target | Brad King | 2018-10-23 | 4 | -0/+7 |
| |/ / | |||||
* | | | Merge branch 'GNUInstallDirs-kfreebsd-man' into release-3.13 | Brad King | 2018-10-22 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSD | James Clarke | 2018-10-22 | 2 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'update-curl' into release-3.13 | Brad King | 2018-10-22 | 114 | -1859/+2568 |
|\ \ \ | |||||
| * | | | curl: Update build within CMake to account for 7.61 changes | Brad King | 2018-10-22 | 2 | -2/+1 |
| * | | | curl: Backport to work with CMake 3.1 again | Brad King | 2018-10-22 | 1 | -2/+3 |
| * | | | Merge branch 'upstream-curl' into update-curl | Brad King | 2018-10-22 | 112 | -1858/+2567 |
| |\ \ \ | |||||
| | * | | | curl 2018-09-04 (432eb5f5) | Curl Upstream | 2018-10-22 | 112 | -1865/+2573 |
| * | | | | curl: Update script to get curl 7.61.1 | Brad King | 2018-10-22 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'curl-ssize_t' into release-3.13 | Brad King | 2018-10-22 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | curl: add missing type sizes for 'long long' and '__int64' | Brad King | 2018-10-22 | 1 | -0/+6 |
| |/ / / | |||||
* | | | | Merge branch 'update-kwsys' into release-3.13 | Brad King | 2018-10-19 | 2 | -1/+6 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'upstream-KWSys' into update-kwsys | Brad King | 2018-10-19 | 2 | -1/+6 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | KWSys 2018-10-19 (c2f29d2e) | KWSys Upstream | 2018-10-19 | 2 | -1/+6 |
* | | | | | Merge branch 'deployqt4-cmp0080-fix' into release-3.13 | Brad King | 2018-10-19 | 2 | -368/+384 |
|\ \ \ \ \ | |||||
| * | | | | | DeployQt4: Do not include BundleUtilities at configure time | Kyle Edwards | 2018-10-19 | 2 | -71/+86 |
| * | | | | | DeployQt4: Convert to 2-space indentation | Kyle Edwards | 2018-10-18 | 1 | -259/+259 |
| * | | | | | Help: Convert DeployQt4 to block-style comment | Kyle Edwards | 2018-10-18 | 1 | -100/+101 |
* | | | | | | Merge branch 'doc-target_link_libraries-item-quoting' into release-3.13 | Brad King | 2018-10-18 | 1 | -0/+12 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Help: Clarify command-line encoding of target_link_libraries items | Brad King | 2018-10-18 | 1 | -0/+12 |
* | | | | | | Merge branch 'update-vim-syntax' into release-3.13 | Brad King | 2018-10-18 | 2 | -106/+2148 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax | Brad King | 2018-10-18 | 2 | -106/+2148 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | vim-cmake-syntax 2018-10-18 (64ff4bd7) | vim-cmake-syntax upstream | 2018-10-18 | 2 | -106/+2148 |
* | | | | | | | | Merge branch 'rel-doc-qthelp' into release-3.13 | Brad King | 2018-10-18 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Utilities/Release: Add qthelp docs to binary archives | Brad King | 2018-10-17 | 2 | -1/+4 |
* | | | | | | | | | Merge branch 'revert-server-iface-sources' into release-3.13 | Brad King | 2018-10-18 | 4 | -189/+40 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | cmake-server: Revert "Support codemodel filegroups for INTERFACE_SOURCES" | Brad King | 2018-10-17 | 4 | -189/+40 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'document-dollar-in-varnames' into release-3.13 | Brad King | 2018-10-16 | 8 | -2/+48 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | CMP0053: document that `$` is a valid literal variable character | Ben Boeckel | 2018-10-15 | 8 | -2/+48 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'update_debug_target_properties' into release-3.13 | Brad King | 2018-10-15 | 1 | -7/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Help: document CMAKE_DEBUG_TARGET_PROPERTIES support for LINK properties | Robert Maynard | 2018-10-12 | 1 | -7/+16 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'FindPkgConfig-operator-docs' into release-3.13 | Brad King | 2018-10-15 | 1 | -6/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | FindPkgConfig: Document support for > and < operators | Craig Scott | 2018-10-15 | 1 | -6/+9 |
* | | | | | | | | | | Merge branch 'FindBoost-mt-release' into release-3.13 | Brad King | 2018-10-11 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | FindBoost: Search for -mt variant of release libs | Mario Bielert | 2018-10-11 | 1 | -0/+1 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'FindPython-updates' into release-3.13 | Brad King | 2018-10-11 | 2 | -2/+77 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | FindPython*: Add missing registry paths | Marc Chevrier | 2018-10-11 | 2 | -2/+77 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'backport-revert-install-code-script-genex' into release-3.13 | Brad King | 2018-10-11 | 10 | -70/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | install: Revert CODE,SCRIPT support for generator expressions | Brad King | 2018-10-11 | 10 | -70/+9 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'vs-cuda-pdb' into release-3.13 | Brad King | 2018-10-10 | 15 | -21/+32 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | VS: Add workaround for CUDA compiler PDB location with space | Brad King | 2018-10-10 | 1 | -0/+7 |
| * | | | | | | | | | VS: Drop workaround for CUDA compiler PDB location on CUDA 9.2+ | Brad King | 2018-10-10 | 1 | -7/+11 |
| * | | | | | | | | | Tests: Fix Cuda test project names | Brad King | 2018-10-10 | 14 | -14/+14 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'update-vim-syntax' into release-3.13 | Brad King | 2018-10-10 | 2 | -44/+118 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'upstream-vim-cmake-syntax' | Patrick Boettcher | 2018-10-10 | 2 | -44/+118 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | |