summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'FindBoost-vs15' into releaseBrad King2016-12-081-2/+6
|\
| * FindBoost: Add support for VS 2017Vic Luo2016-12-081-2/+6
* | Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into releaseBrad King2016-12-071-1/+10
|\ \
| * | VS: Fix standalone Windows7.1SDK toolset selectionBrad King2016-12-071-1/+10
| |/
* | Merge branch 'vs-Zc-inline' into releaseBrad King2016-11-302-0/+3
|\ \
| * | VS: Add v140 flag table entries for `-Zc:inline[-]`Brad King2016-11-301-0/+2
| * | VS: Add v141 flag table entry for `-Zc:inline-`Brad King2016-11-301-0/+1
| |/
* | Merge branch 'cmake-server-pad-arguments' into releaseBrad King2016-11-301-1/+1
|\ \ | |/ |/|
| * server-mode: Do not ignore the first cacheArgument on configureTobias Hunger2016-11-301-1/+1
|/
* CMake 3.7.1v3.7.1Brad King2016-11-301-1/+1
* Merge branch 'vs15-rename-generator' into releaseBrad King2016-11-295-14/+17
|\
| * VS: Rename VS 15 generator to 'Visual Studio 15 2017'Roman Wüger2016-11-295-14/+17
* | Merge branch 'libarchive-openssl-1.1' into releaseBrad King2016-11-289-41/+183
|\ \
| * | libarchive: Add support for building with OpenSSL 1.1Brad King2016-11-286-38/+75
| * | libarchive: Add headers to adapt between OpenSSL 1.1 and older versionsBrad King2016-11-286-3/+108
* | | Merge branch '16449-revert-xcode-system-includes' into releaseBrad King2016-11-283-44/+19
|\ \ \
| * | | Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"Gregor Jasny2016-11-283-44/+19
| |/ /
* | | Merge branch 'doc-CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT' into releaseBrad King2016-11-213-0/+17
|\ \ \ | |_|/ |/| |
| * | Help: Document CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT variableBrad King2016-11-213-0/+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
| |/ / /