summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* prefer list(APPEND) over string(APPEND) where appropriateDaniel Pfeifer2016-08-085-8/+8
|
* 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
| | | | | | | | | | | | | | | | Closes: #16213
| * | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe7f117a bash-completion: Fix cmake -E lookup
| * | | | | | | | bash-completion: Fix cmake -E lookupSylvain Joubert2016-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of long '<command> <args...>' the description text is wrapped and indented on the next line. Avoid taking these lines into account by explicitly requiring the third character to be a non-space.
* | | | | | | | | Merge topic 'update-cle-version-info'Brad King2016-08-082-4/+14
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | e52302d6 CrayLinuxEnvironment: Add alternative methods to get version info
| * | | | | | | | CrayLinuxEnvironment: Add alternative methods to get version infoChuck Atkins2016-08-052-4/+14
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes: #16229
* | | | | | | | Merge topic 'FindOpenCL-macOS'Brad King2016-08-081-3/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88f2455f FindOpenCL: Fix search on macOS.
| * | | | | | | | FindOpenCL: Fix search on macOS.Matthäus G. Chajdas2016-08-081-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original patch was provided by jerry <jerry.c.t@web.de>.
* | | | | | | | | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-08-081-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 038e3a4f cmVisualStudio10TargetGenerator: Run clang-format
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e555480c Ninja: Fix response file format for GNU-like Clang on Windows
| * | | | | | | | Ninja: Fix response file format for GNU-like Clang on WindowsBrad King2016-08-041-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CMAKE_<LANG>_SIMULATE_ID` variables are not set to "GNU" for a GNU-like Clang compiler on Windows. They are only set to "MSVC" for a MSVC-like Clang. Revise our response file format selection accordingly. Reported-by: Chaoren Lin <chaorenl@google.com>
* | | | | | | | | Merge topic 'update-kwsys'Brad King2016-08-053-0/+73
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8abca140 Merge branch 'upstream-KWSys' into update-kwsys 6c0820a8 KWSys 2016-08-03 (6d23dd7e)
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-043-0/+73
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-08-03 (6d23dd7e)
| | * | | | | | | | | KWSys 2016-08-03 (6d23dd7e)KWSys Upstream2016-08-043-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 6d23dd7e455a7b2088c4ec6dce760d8243b84ee6 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 6d23dd7e SystemTools: add a PathExists method
* | | | | | | | | | | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-08-051-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ada475e VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolset
| * | | | | | | | | | VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolsetBrad King2016-08-041-1/+4
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: #16213
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-08-051-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'find-module-imported-fallback-to-release'Brad King2016-08-047-63/+63
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff386d11 Modules: Make imported targets fall back to `Release`
| * | | | | | | | | Modules: Make imported targets fall back to `Release`Brad King2016-08-037-63/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find modules only detect Debug and Release configurations. All other configurations will fall back to the configuration listed as the first entry in `IMPORTED_CONFIGURATIONS`. Switch the order so that `Release` is listed first, as this is a better fallback than `Debug` for the `RelWithDebInfo` and `MinSizeRel` configurations. See issue #16091. This approach is recommended by documentation in `cmake-developer(7)` added by commit v3.2.0-rc1~286^2~1 (Help: Document IMPORTED_CONFIGURATIONS target property for Find modules, 2014-12-04).
* | | | | | | | | | Merge topic 'extra-generator-factories'Brad King2016-08-0416-235/+285
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd52a225 Report more information about extra generators in generator factories a354f60c Refactor extra generator registration to use factories
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow additional information about the availability and capabilities of extra generators to be queried without actually creating them. Instead of a static NewFactory() method like the main generator factories have, use a static GetFactory() method to get a pointer to a statically allocated extra generator factory. This simplifies memory management.
* | | | | | | | | | | Merge topic 'update-kwsys'Brad King2016-08-042-12/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b602cb85 Merge branch 'upstream-KWSys' into update-kwsys 3e6ec47c KWSys 2016-08-02 (3f55579d)
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-032-12/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | / / / / / / / | | | |_|/ / / / / / / | | |/| | | | | | | | * upstream-KWSys: KWSys 2016-08-02 (3f55579d)
| | * | | | | | | | | KWSys 2016-08-02 (3f55579d)KWSys Upstream2016-08-032-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 3f55579d113f92fcda8f9eff7046c36873c121f6 (master). Upstream Shortlog ----------------- Patrick Welche (3): 8a989b44 SystemInformation: Treat BSDs more uniformly 2ce319a6 SystemInformation: Treat Solaris the same as Linux 3f55579d SystemTools: Fix FileExists for some SCO OpenServer file permissions
* | | | | | | | | | | Merge topic 'update-curl'Brad King2016-08-04261-7481/+11916
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f59ab433 curl: Remove CMake-specific README f53f4a8a Merge branch 'upstream-curl' into update-curl 202adcfe curl 2016-08-03 (f2cb3a01) e1c11352 curl: Update script to get curl 7.50.1 a51c6c53 Merge branch 'upstream-curl' into update-curl 7ec709d3 curl 2015-08-11 (1a7f66a3) 3e9b0343 Add script to update curl from upstream
| * | | | | | | | | curl: Remove CMake-specific READMEBrad King2016-08-031-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will now manage the curl source tree updates using the `Utilities/Scripts/update-curl.bash` script. Drop the README that covered the old method.
| * | | | | | | | | Merge branch 'upstream-curl' into update-curlBrad King2016-08-03259-7415/+11878
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01)
| | * | | | | | | | | curl 2016-08-03 (f2cb3a01)Curl Upstream2016-08-03259-7411/+11887
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/bagder/curl.git at commit f2cb3a01192d36395d16acec6cdb93446ca6fd45 (curl-7_50_1).
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/bagder/curl.git at commit 1a7f66a3de2625d10f65415e6eb3e56067dc0555 (curl-7_44_0).
| * | | | | | | | | | Add script to update curl from upstreamBrad King2016-08-031-0/+36
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-08-041-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'ccmake-vim-navigation'Brad King2016-08-034-15/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e34e9c27 ccmake: Add VIM-like bindings for navigation 9a1b6c60 ccmake: Revise documentation for [d] 31b6cf41 ccmake: Fix typo in help (it's -> its)
| * | | | | | | | | ccmake: Add VIM-like bindings for navigationPaul Seyfert2016-08-024-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * scroll with j/k * toggle bool with space, enter insert mode with i * bindings not shown at the bottom of the screen, but given in help
| * | | | | | | | | ccmake: Revise documentation for [d]Paul Seyfert2016-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * list it at the bottom of the screen * different place in help message
| * | | | | | | | | ccmake: Fix typo in help (it's -> its)Paul Seyfert2016-08-021-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'CMakeFindFrameworks-custom-locations'Brad King2016-08-031-1/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9970cdcb CMakeFindFrameworks: Allow custom framework locations