summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'fix-string-append'Brad King2016-08-098-11/+11
|\
| * Revert the use of string(APPEND) in .cmake.in filesDaniel Pfeifer2016-08-083-3/+3
| * prefer list(APPEND) over string(APPEND) where appropriateDaniel Pfeifer2016-08-085-8/+8
* | Merge topic 'GetPrerequisites-grep-a'Brad King2016-08-091-1/+1
|\ \
| * | GetPrerequisites: Always filter objdump output as textAlexander Shishenko2016-08-081-1/+1
* | | Merge topic 'ninja-full-path'Brad King2016-08-091-3/+4
|\ \ \ | |/ /
| * | Ninja: Use full path for all source filesChaoren Lin2016-08-081-3/+4
| |/
* | Merge topic 'wix-custom-install-dir'Brad King2016-08-096-4/+55
|\ \
| * | CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER featureMichael Stürmer2016-08-086-4/+55
* | | CMake Nightly Date StampKitware Robot2016-08-091-1/+1
| |/ |/|
* | Merge branch 'release'Brad King2016-08-080-0/+0
|\ \
| * \ Merge branch 'update-cle-version-info' into releaseBrad King2016-08-082-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
| |\ \ \ \
| * \ \ \ \ Merge branch 'intel-gnu11-support' into releaseBrad King2016-08-031-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-findhdf5-definitions' into releaseBrad King2016-08-021-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS' into releaseBrad King2016-08-021-0/+8
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'bash-completion-fix-E-lookup'Brad King2016-08-081-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bash-completion: Fix cmake -E lookupSylvain Joubert2016-08-051-1/+1
* | | | | | | | | | Merge topic 'update-cle-version-info'Brad King2016-08-082-4/+14
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | CrayLinuxEnvironment: Add alternative methods to get version infoChuck Atkins2016-08-052-4/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'FindOpenCL-macOS'Brad King2016-08-081-3/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | FindOpenCL: Fix search on macOS.Matthäus G. Chajdas2016-08-081-3/+10
* | | | | | | | | | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-08-081-5/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | cmVisualStudio10TargetGenerator: Run clang-formatBrad King2016-08-051-5/+5
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-08-081-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-08-071-1/+1
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-08-061-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge topic 'ninja-clang-rsp-format'Brad King2016-08-051-5/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Ninja: Fix response file format for GNU-like Clang on WindowsBrad King2016-08-041-5/+7
* | | | | | | | | Merge topic 'update-kwsys'Brad King2016-08-053-0/+73
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-043-0/+73
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | KWSys 2016-08-03 (6d23dd7e)KWSys Upstream2016-08-043-0/+73
* | | | | | | | | | | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-08-051-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolsetBrad King2016-08-041-1/+4
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-08-051-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'find-module-imported-fallback-to-release'Brad King2016-08-047-63/+63
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Modules: Make imported targets fall back to `Release`Brad King2016-08-037-63/+63
* | | | | | | | | | Merge topic 'extra-generator-factories'Brad King2016-08-0416-235/+285
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Report more information about extra generators in generator factoriesTobias Hunger2016-08-032-0/+9
| * | | | | | | | | | Refactor extra generator registration to use factoriesTobias Hunger2016-08-0316-235/+276
* | | | | | | | | | | Merge topic 'update-kwsys'Brad King2016-08-042-12/+8
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-032-12/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | / / / / / / / | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | KWSys 2016-08-02 (3f55579d)KWSys Upstream2016-08-032-12/+8
* | | | | | | | | | | Merge topic 'update-curl'Brad King2016-08-04261-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