summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
|\ \ \
| * | | VS: Fix VS 2015 .vcxproj debug setting for v90 toolset (#15986)Brad King2016-07-131-1/+2
* | | | Merge branch 'FindHDF5-fix-misc-issues' into releaseBrad King2016-07-131-37/+99
|\ \ \ \
| * | | | FindHDF5: Cleanup inconsistent use of HDF5_ROOTChuck Atkins2016-07-121-10/+14
| * | | | FindHDF5: Properly fail when required components are not found.Chuck Atkins2016-07-121-1/+20
| * | | | FindHDF5: Fix h5cc arg parsing to work with homebrew on MacChuck Atkins2016-07-121-26/+65
| | |/ / | |/| |
* | | | Merge branch 'fix-cpack-rpm-different-package-names' into releaseBrad King2016-07-111-0/+1
|\ \ \ \
| * | | | CPack/RPM: Add missed CPACK_RPM_FILE_NAME fallback variableAlex Turbov2016-07-111-0/+1
| |/ / /
* | | | Merge branch 'find-command-restore-PATH-on-unix' into releaseBrad King2016-07-111-4/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Restore find_(library|file|path) search of PATH itselfBrad King2016-07-111-4/+2
|/ / /
* | | CMake 3.6.0v3.6.0Brad King2016-07-071-1/+1
* | | Merge branch 'cpack-ifw-fix-repo-attributes' into releaseBrad King2016-07-051-2/+2
|\ \ \
| * | | CPackIFW: Fix attributes for Promoting Updates repository replacementKonstantin Podsvirov2016-07-051-2/+2
* | | | Merge branch 'FindJNI-ubuntu-paths' into releaseBrad King2016-07-051-3/+4
|\ \ \ \
| * | | | FindJNI: Fix support for Ubuntu 15.10O Libre2016-07-051-3/+4
| |/ / /
* | | | Merge branch 'clang-format-script' into releaseBrad King2016-06-301-4/+8
|\ \ \ \
| * | | | clang-format.bash: Fix filter-branch example documentationBrad King2016-06-301-4/+8
* | | | | Merge branch 'doc-updates' into releaseBrad King2016-06-302-2/+18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES exampleBrad King2016-06-301-0/+16
| * | | | InstallRequiredSystemLibraries: Document UCRT option use caseBrad King2016-06-301-2/+2
|/ / / /
* | | | CMake 3.6.0-rc4v3.6.0-rc4Brad King2016-06-291-1/+1
* | | | Merge branch 'revert-try_compile-config-flags' into releaseBrad King2016-06-285-34/+0
|\ \ \ \
| * | | | Revert "try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes"Brad King2016-06-285-34/+0
* | | | | Merge branch 'doc-cross-reference-lang-standard-and-extensions' into releaseBrad King2016-06-284-2/+8
|\ \ \ \ \
| * | | | | Help: Cross reference CXX_STANDARD and CXX_EXTENSIONS (#16162)Gregor Jasny2016-06-284-2/+8
| |/ / / /
* | | | | Merge branch 'ninja-no-rsp-for-rc' into releaseBrad King2016-06-276-2/+28
|\ \ \ \ \
| * | | | | ninja, rc: ignore CMAKE_NINJA_FORCE_RESPONSE_FILE for RC filesBen Boeckel2016-06-276-2/+28
| |/ / / /
* | | | | Merge branch 'FindHDF5-handle-unsuffixed' into releaseBrad King2016-06-271-4/+21
|\ \ \ \ \
| * | | | | FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmakeRobert Maynard2016-06-241-0/+4
| * | | | | FindHDF5: cache the correct path to the high level librariesRobert Maynard2016-06-241-3/+3
| * | | | | FindHDF5: When component targets not found fallback to compiler wrappersRobert Maynard2016-06-231-0/+6
| * | | | | FindHDF5: Handle HDF5 builds with non-suffixed componentsRobert Maynard2016-06-231-0/+7
| * | | | | FindHDF5: correctly add lang to each component target name.Robert Maynard2016-06-231-1/+1
| |/ / / /
* | | | | Merge branch 'doc-osx-versions' into releaseBrad King2016-06-233-13/+43
|\ \ \ \ \
| * | | | | Help: Describe VERSION and SOVERSION meanings for Mach-O binariesBartosz Kosiorek2016-06-233-13/+43
| |/ / / /
* | | | | Merge branch 'backport-GetPrerequisites-typo' into releaseBrad King2016-06-231-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | GetPrerequisites: fix typo in commentRolf Eike Beer2016-06-221-1/+1
|/ / / /
* | | | CMake 3.6.0-rc3v3.6.0-rc3Brad King2016-06-221-1/+1