summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* list: Allow inserting at the end of a listDaniel Chabrowski2018-07-054-6/+8
| | | | Fixes: #18069
* CMake Nightly Date StampKitware Robot2018-07-011-1/+1
|
* CMake Nightly Date StampKitware Robot2018-06-301-1/+1
|
* Merge branch 'release-3.12'Brad King2018-06-290-0/+0
|\
| * CMake 3.12.0-rc2v3.12.0-rc2Brad King2018-06-291-1/+1
| |
* | Merge topic 'FindBoost-arch-check-style'Brad King2018-06-291-5/+5
|\ \ | | | | | | | | | | | | | | | | | | df2875b58d FindBoost: Update MSVC architecture check code style Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2172
| * | FindBoost: Update MSVC architecture check code styleMatt Powley2018-06-271-5/+5
| | |
* | | Merge topic 'cpackrpm-cmake_command'Brad King2018-06-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 611ad19499 CPack/RPM: Use CMAKE_COMMAND to reference cmake executable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2168
| * | | CPack/RPM: Use CMAKE_COMMAND to reference cmake executableDaniel Wyatt2018-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure we use the `cmake` corresponding to the running `cpack` even if it is not first in `PATH` or has had its name changed. This was accidentally left out in commit v3.7.0-rc1~81^2 (CPack/RPM: Generate source rpm (SRPM) packages on demand, 2016-09-19).
* | | | Merge branch 'release-3.12'Brad King2018-06-290-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'FindOpenMP-avoid-warning-in-check' into release-3.12Brad King2018-06-271-1/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2176
| * \ \ \ Merge branch 'ctest_submit-https' into release-3.12Brad King2018-06-274-9/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2171
| * \ \ \ \ Merge branch 'lexer-null' into release-3.12Brad King2018-06-266-103/+106
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2174
| * \ \ \ \ \ Merge branch 'FindMatlab-doc-mcr' into release-3.12Brad King2018-06-261-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2173
* | \ \ \ \ \ \ Merge topic 'FindOpenMP-avoid-warning-in-check'Brad King2018-06-291-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 826bf5c454 FindOpenMP: Avoid warning in check code Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !2176
| * | | | | | | FindOpenMP: Avoid warning in check codeBrad King2018-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test code added by commit v3.12.0-rc1~411^2~1 (FindOpenMP: Verify in test source that OMP library is linked, 2018-03-01) leaves an unused variable warning. This breaks the check with `-Werror`. Remove the variable and leave just the function call, which should still check that the OMP library is linked. Fixes: #18102
* | | | | | | | Merge topic 'ctest_submit-https'Brad King2018-06-294-9/+14
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71f27c04b0 ctest_submit: show headers as debug info 4464ef21da ctest_submit: Check CA file during CDASH_UPLOAD Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2171
| * | | | | | | ctest_submit: show headers as debug infoZack Galbreath2018-06-274-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide any headers specified by `ctest_submit(HTTPHEADER ...)` unless ctest is run with --debug. This option is used to present bearer tokens to CDash. We do not want to inadvertently expose this secret data in the console output log.
| * | | | | | | ctest_submit: Check CA file during CDASH_UPLOADZack Galbreath2018-06-271-0/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where ctest(SUBMIT CDASH_UPLOAD ...) would fail when attemping to submit to a site bearing a genuine SSL certificate. This code path was missing a call to cmCurlSetCAInfo() which loads the certificate authority file.
* | | | | | | Merge topic 'lexer-null'Brad King2018-06-296-103/+106
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b29842a818 ListFileLexer: Do not match null bytes in input Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2174
| * | | | | | ListFileLexer: Do not match null bytes in inputBrad King2018-06-266-103/+106
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix from commit v3.10.0-rc1~188^2 (ListFileLexer: fix heap-buffer-overflow on malicious input, 2017-08-26) to apply to all lexer token matches. Replace all `.` with `[^\0\n]`. Update all `[^...]` match expressions to not match `\0`. We cannot safely process null bytes in strings. Fixes: #18124
* | | | | | Merge topic 'FindMatlab-doc-mcr'Brad King2018-06-291-0/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 27ae8d52d0 Help: Add 3.12 release note for FindMatlab MCR support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2173
| * | | | | Help: Add 3.12 release note for FindMatlab MCR supportBrad King2018-06-261-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | This release note was forgotten by commit v3.12.0-rc1~183^2 (FindMatlab: Matlab Runtime Compiler support, 2018-04-29).
* | | | | CMake Nightly Date StampKitware Robot2018-06-291-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-06-281-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-06-271-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-06-261-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release-3.12'Brad King2018-06-250-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'libuv-new-version-file-location' into release-3.12Brad King2018-06-251-0/+2
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2169
* | \ \ \ Merge topic 'libuv-new-version-file-location'Brad King2018-06-251-0/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 889033b5c6 FindLibUV: Also check uv/version.h for version detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2169
| * | | | FindLibUV: Also check uv/version.h for version detectionRaphael Kubo da Costa2018-06-251-0/+2
| | |/ / | |/| | | | | | | | | | | | | | Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory. Make FindLibUV aware of the file's new location for configuration to work.
* | | | Merge topic 'update-kwsys'Brad King2018-06-259-41/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b41b30f16e Update use of KWSys SystemTools::SplitString for new signature f2d97c1cdf Merge branch 'upstream-KWSys' into update-kwsys 6d7fdedde6 KWSys 2018-06-22 (49068d94) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2165
| * | | | Update use of KWSys SystemTools::SplitString for new signatureBrad King2018-06-227-26/+21
| | | | |
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-06-222-15/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-06-22 (49068d94)
| | * | | | KWSys 2018-06-22 (49068d94)KWSys Upstream2018-06-222-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 49068d948ee03cde172fe5ff15a2778c50f91d38 (master). Upstream Shortlog ----------------- Brad King (1): 5d6f59fe SystemTools: Change SplitString return type to use std::string
* | | | | | Merge topic 'test-wizard'Brad King2018-06-254-4/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7bffd71c3b Tests: Adopt wizard test in RunCMake.CommandLine Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2166
| * | | | | | Tests: Adopt wizard test in RunCMake.CommandLineBrad King2018-06-224-4/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | Avoid a whole separate test for one removed command-line option.
* | | | | | Merge branch 'release-3.12'Brad King2018-06-250-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'vs-filter-default-toolset' into release-3.12Brad King2018-06-256-27/+73
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2162
| * \ \ \ \ \ Merge branch 'file-GLOB-remove-new-errors' into release-3.12Brad King2018-06-227-28/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2164
* | \ \ \ \ \ \ Merge topic 'vs-filter-default-toolset'Brad King2018-06-256-27/+73
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c4698da3a VS: Allow toolset version selection to specify default toolset b759f7068f cmVSSetupHelper: Expose default toolset version d548994afc cmVSSetupHelper: Use in-class member initialization Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2162
| * | | | | | | VS: Allow toolset version selection to specify default toolsetBasil Fierz2018-06-244-18/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the feature added by commit v3.12.0-rc1~38^2 (VS: Add option to select the version of the toolset used by VS 2017, 2018-05-19) to accept the default toolset version in addition to older versions. If the default toolset version is supplied, simply clear it so the default will be used. Fixes: #18107
| * | | | | | | cmVSSetupHelper: Expose default toolset versionBasil Fierz2018-06-222-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already detect the VS toolset version. Expose it to clients.
| * | | | | | | cmVSSetupHelper: Use in-class member initializationBrad King2018-06-221-9/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'file-GLOB-remove-new-errors'Brad King2018-06-257-28/+12
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 142a625729 file: Drop error cases added by CMake 3.12.0-rc1 to avoid regressions Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Shane Parris <shane.lee.parris@gmail.com> Merge-request: !2164
| * | | | | | file: Drop error cases added by CMake 3.12.0-rc1 to avoid regressionsBrad King2018-06-227-28/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.12.0-rc1~418^2~3 (Refactor HandleGlobCommand, 2018-02-13) introduced error diagnostics for argument combinations that were previously accepted. Restore acceptance to avoid regressing projects that used those combinations even if they do not make sense. Fixes: #18097
* | | | | | CMake Nightly Date StampKitware Robot2018-06-251-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-06-241-1/+1
| | | | | |
* | | | | | Merge topic 'cmake-buildsystem-manual-typo'Craig Scott2018-06-231-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82956270ed Help: Fix typo in cmake-buildsystem(7) manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2163
| * | | | | Help: Fix typo in cmake-buildsystem(7) manualJoan Massich2018-06-221-1/+1
| | | | | |