summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* VS: Rename VS 15 generator to 'Visual Studio 15 2017'Roman Wüger2016-11-295-14/+17
* Merge branch 'vs-15-preview-5' into releaseBrad King2016-11-182-2/+2
|\
| * VS: Update VS 15 generator for Preview 5Brad King2016-10-062-2/+2
* | Merge branch 'backport-android-info-variables' into releaseBrad King2016-11-1811-6/+87
|\ \
| * | Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINEBrad King2016-11-188-2/+42
| * | Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variableBrad King2016-11-186-0/+19
| * | Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSIONBrad King2016-11-186-4/+26
* | | Merge branch 'armcc-response-file-flag' into releaseBrad King2016-11-151-0/+1
|\ \ \
| * | | ARMCC: Fix flag used for response filesBen Boeckel2016-11-151-0/+1
| |/ /
* | | Merge branch 'cmake-server-fix-16423' into releaseBrad King2016-11-142-28/+77
|\ \ \
| * | | server-mode: Reset GlobalGenerator before configureTobias Hunger2016-11-142-28/+77
| |/ /
* | | Merge branch 'cmake-server-fix-16422' into releaseBrad King2016-11-141-1/+1
|\ \ \
| * | | server-mode: Prevent possible crash when watching directoriesTobias Hunger2016-11-141-1/+1
| |/ /
* | | Merge branch 'FindBISON-fix-rebuild' into releaseBrad King2016-11-141-1/+1
|\ \ \ | |/ / |/| |
| * | FindBISON: Do not rebuild every time when not VERBOSEBrad King2016-11-141-1/+1
|/ /
* | CMake 3.7.0v3.7.0Brad King2016-11-111-1/+1
* | Merge branch 'autorcc-only-no-rebuild' into releaseBrad King2016-11-091-2/+2
|\ \
| * | QtAutogen: Do not re-generate AUTORCC outputs on every buildBrad King2016-11-091-2/+2
* | | Merge branch 'pkgconfig_imported_target' into releaseBrad King2016-11-081-1/+1
|\ \ \ | |/ / |/| |
| * | PkgConfig: Fix FindPkgConfig imported target featureFlorent Castelli2016-11-041-1/+1
|/ /
* | CMake 3.7.0-rc3v3.7.0-rc3Brad King2016-11-041-1/+1
* | Merge branch 'cpackifw-search-algorithm' into releaseBrad King2016-11-031-21/+47
|\ \
| * | CPackIFW: Update search to find QtIFW distributed with QtSDKKonstantin Podsvirov2016-11-031-21/+47
* | | Merge branch 'FindHDF5-restore-default-C' into releaseBrad King2016-11-021-10/+2
|\ \ \
| * | | FindHDF5: Restore pre-3.6 behavior of finding only C by defaultBrad King2016-11-021-10/+2
* | | | Merge branch 'doc-cmake-qt-fixes' into releaseBrad King2016-11-021-1/+1
|\ \ \ \
| * | | | Help: Update example Qt 5 find_package call to add missing componentThiago M. de C. Marques2016-11-021-1/+1
| * | | | Help: Update example Qt 5 find_package call to use COMPONENTSMarcus D. Hanwell2016-11-021-1/+1
| | |/ / | |/| |
* | | | Merge branch 'cpack-doc-typos' into releaseBrad King2016-11-022-7/+7
|\ \ \ \
| * | | | CPackRPM: Fix incorrect variable name in documentationAlex Turbov2016-11-021-3/+3
| * | | | CPackDeb: Fix incorrect variable name in documentationAlex Turbov2016-11-021-1/+1
| * | | | CPackDeb: fix copy-n-paste typos in documentationAlex Turbov2016-11-011-3/+3
| |/ / /
* | | | Merge branch 'fix-macos-sysroot' into releaseBrad King2016-11-022-30/+2
|\ \ \ \
| * | | | Darwin: Remove deployment target version checkGregor Jasny2016-11-012-26/+0
| * | | | Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path"Gregor Jasny2016-11-011-4/+2
| |/ / /
* | | | Merge branch 'FindMatlab-fix-typo' into releaseBrad King2016-10-282-3/+3
|\ \ \ \
| * | | | FindMatlab: Fix typo in matlab_add_unit_test implementationMatthew Woehlke2016-10-282-3/+3
| |/ / /
* | | | Merge branch 'FindMatlab-9.1' into releaseBrad King2016-10-281-0/+1
|\ \ \ \
| * | | | FindMatlab: Add support for Matlab 2016b (9.1)Francesco Romano2016-10-281-0/+1
| |/ / /
* | | | Merge branch 'cmake-server-handshake-improvements' into releaseBrad King2016-10-284-66/+104
|\ \ \ \
| * | | | server-mode: Handle generator toolset and platform in handshakeTobias Hunger2016-10-283-2/+35
| * | | | cmake-server: Better error reporting during handshakeTobias Hunger2016-10-272-66/+71
* | | | | Merge branch 'intel-17-features' into releaseBrad King2016-10-261-3/+3
|\ \ \ \ \
| * | | | | Features: Record features for Intel C++ 17 on UNIXBrad King2016-10-261-3/+3
* | | | | | Merge branch 'cmake-server-message-quoting' into releaseBrad King2016-10-243-61/+61
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | cmake-server: Change message wrapper to avoid ambiguity with contentBrad King2016-10-243-61/+61
* | | | | | Merge branch 'intel-compile-features-windows' into releaseBrad King2016-10-242-6/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Intel: Fix compiler extension flags on WindowsBrad King2016-10-242-6/+12
| | |/ / / | |/| | |
* | | | | Merge branch 'android-pic' into releaseBrad King2016-10-2415-35/+9
|\ \ \ \ \
| * | | | | Android: Link position-independent executables with proper flagsBrad King2016-10-241-0/+4