summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* CMake 3.6.3v3.6.3Brad King2016-11-021-1/+1
* Merge branch 'FindHDF5-restore-default-C' into release-3.6Brad King2016-11-021-10/+2
|\
| * FindHDF5: Restore pre-3.6 behavior of finding only C by defaultBrad King2016-11-021-10/+2
* | Merge branch 'qtdialog-lib-paths' into release-3.6Brad King2016-11-021-0/+2
|\ \ | |/ |/|
| * cmake-gui: Do not remove library paths for Qt5 plugins.Clinton Stimpson2016-09-221-0/+2
|/
* CMake 3.6.2v3.6.2Brad King2016-09-071-1/+1
* Merge branch 'backport-curl-fix' into releaseBrad King2016-09-071-1/+7
|\
| * curl: Backport certificate reuse fix from 7.50.2Brad King2016-09-071-1/+7
|/
* Merge branch 'FindHDF5-fix-hl-fortran' into releaseBrad King2016-09-021-1/+1
|\
| * FindHDF5: Fix regression in finding hdf5hl_fortranBrad King2016-09-021-1/+1
* | Merge branch 'FindHDF5-is-parallel' into releaseBrad King2016-09-021-8/+60
|\ \
| * | FindHDF5: Fix regression in providing HDF5_IS_PARALLELBrad King2016-09-021-8/+60
| |/
* | Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-09-011-1/+3
|\ \
| * | VS: Fix VS 2015 .vcxproj debug setting for v80 toolsetBrad King2016-09-011-1/+3
* | | Merge branch 'vs-NsightTegra-empty-version' into releaseBrad King2016-08-261-5/+4
|\ \ \
| * | | VS: Fix out-of-bounds write on empty Nsight Tegra versionFujii Hironori2016-08-261-5/+4
* | | | Merge branch 'intel-fortran-mod-diff' into releaseBrad King2016-08-241-0/+6
|\ \ \ \
| * | | | Fortran: Fix .mod file comparison for Intel 16 formatBrad King2016-08-241-0/+6
| |/ / /
* | | | Merge branch 'GetPrerequisites-fix-regression' into releaseBrad King2016-08-121-2/+6
|\ \ \ \
| * | | | GetPrerequisites: Fix regression in gp_resolved_file_typeBrad King2016-08-121-2/+6
| |/ / /
* | | | Merge branch 'update-cle-version-info' into releaseBrad King2016-08-082-4/+14
|\ \ \ \
| * | | | CrayLinuxEnvironment: Add alternative methods to get version infoChuck Atkins2016-08-052-4/+14
| |/ / /
* | | | Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-08-051-4/+7
|\ \ \ \ | | |/ / | |/| |
| * | | VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolsetBrad King2016-08-051-4/+7
* | | | Merge branch 'update-curl' into releaseBrad King2016-08-03261-7481/+11916
|\ \ \ \
| * | | | curl: Remove CMake-specific READMEBrad King2016-08-031-66/+0
| * | | | Merge branch 'upstream-curl' into update-curlBrad King2016-08-03259-7415/+11878
| |\ \ \ \
| | * | | | curl 2016-08-03 (f2cb3a01)Curl Upstream2016-08-03259-7411/+11887
| * | | | | curl: Update script to get curl 7.50.1Brad King2016-08-031-1/+3
| * | | | | Merge branch 'upstream-curl' into update-curlBrad King2016-08-030-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | curl 2015-08-11 (1a7f66a3)Curl Upstream2016-08-030-0/+0
| * | | | | Add script to update curl from upstreamBrad King2016-08-031-0/+36
| | |_|/ / | |/| | |
* | | | | Merge branch 'intel-gnu11-support' into releaseBrad King2016-08-031-4/+4
|\ \ \ \ \
| * | | | | Intel-C: standard flags are also supported in 12.0Ben Boeckel2016-08-021-1/+1
| * | | | | Intel-C: support gnu89 and gnu99 extension flagsBen Boeckel2016-08-021-2/+2
| * | | | | Intel-C: declare support for gnu11Ben Boeckel2016-08-021-1/+1
* | | | | | Merge branch 'fix-findhdf5-definitions' into releaseBrad King2016-08-021-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | FindHDF5: Make sure compile definition vars keep the -D flagChuck Atkins2016-08-021-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS' into releaseBrad King2016-08-021-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRSKonstantin Sinitsyn2016-08-021-0/+8
|/ / / /
* | | | CMake 3.6.1v3.6.1Brad King2016-07-221-1/+1
* | | | Merge branch 'revert-autogen-subdirs' into releaseBrad King2016-07-2122-377/+45
|\ \ \ \
| * | | | Autogen: Revert changes to generate moc/rcc in subdirectoriesBrad King2016-07-2122-377/+45
| |/ / /
* | | | Merge branch 'nsis-protect-uninst-exec' into releaseBrad King2016-07-212-1/+7
|\ \ \ \
| * | | | NSIS: Quote uninstaller path when executing it in a shellJustin Clift2016-07-212-1/+7
| |/ / /
* | | | Merge branch 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into releaseBrad King2016-07-191-1/+2
|\ \ \ \
| * | | | CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS valueBrad King2016-07-191-1/+2
| |/ / /
* | | | Merge branch 'ninja-no-accidental-rsp' into releaseBrad King2016-07-151-1/+1
|\ \ \ \
| * | | | Ninja: Do not force response files when no sysconf(3) limit is usedBrad King2016-07-151-1/+1
| |/ / /
* | | | Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-07-131-1/+2
|\ \ \ \ | | |_|/ | |/| |