Commit Graph

39963 Commits

Author SHA1 Message Date
Brad King eb63a07eaa Utilities/Release: Explicitly enable ccmake on macOS and Linux
Since commit v3.12.0-rc1~325^2 (ccmake: Check for curses more robustly
before enabling, 2018-03-21) we may not enable ccmake by default when
using a non-system curses (e.g. the static curses we build on Linux for
our binaries).  Enable the option explicitly for our prebuilt binaries.
2018-07-02 11:36:15 -04:00
Kitware Robot 752c2721a1 CMake Nightly Date Stamp 2018-07-02 00:01:04 -04:00
Kitware Robot dc70284c81 CMake Nightly Date Stamp 2018-07-01 00:01:23 -04:00
Kitware Robot ed95fe5c7a CMake Nightly Date Stamp 2018-06-30 00:01:22 -04:00
Brad King 9539985fb2 Merge branch 'release-3.12' 2018-06-29 10:34:18 -04:00
Brad King 51e7d41507 CMake 3.12.0-rc2 v3.12.0-rc2 2018-06-29 09:03:08 -04:00
Brad King 38db92f668 Merge topic 'FindBoost-arch-check-style'
df2875b58d FindBoost: Update MSVC architecture check code style

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2172
2018-06-29 09:02:28 -04:00
Brad King aa8fe65cd7 Merge topic 'cpackrpm-cmake_command'
611ad19499 CPack/RPM: Use CMAKE_COMMAND to reference cmake executable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2168
2018-06-29 09:01:52 -04:00
Brad King 683e129090 Merge branch 'release-3.12' 2018-06-29 08:58:28 -04:00
Brad King da1f533696 Merge topic 'FindOpenMP-avoid-warning-in-check'
826bf5c454 FindOpenMP: Avoid warning in check code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Henry Schreiner <henryschreineriii@gmail.com>
Merge-request: !2176
2018-06-29 08:57:10 -04:00
Brad King 08813b17a1 Merge topic 'ctest_submit-https'
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
2018-06-29 08:56:25 -04:00
Brad King faa9ef9968 Merge topic 'lexer-null'
b29842a818 ListFileLexer: Do not match null bytes in input

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2174
2018-06-29 08:55:47 -04:00
Brad King a3371e70b7 Merge topic 'FindMatlab-doc-mcr'
27ae8d52d0 Help: Add 3.12 release note for FindMatlab MCR support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2173
2018-06-29 08:54:53 -04:00
Kitware Robot 5f4af3e556 CMake Nightly Date Stamp 2018-06-29 00:01:17 -04:00
Kitware Robot 21a2ace381 CMake Nightly Date Stamp 2018-06-28 00:01:22 -04:00
Brad King d43c9152a6 Merge branch 'FindOpenMP-avoid-warning-in-check' into release-3.12
Merge-request: !2176
2018-06-27 15:27:21 -04:00
Brad King 826bf5c454 FindOpenMP: Avoid warning in check code
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
2018-06-27 15:24:22 -04:00
Brad King decfdec63f Merge branch 'ctest_submit-https' into release-3.12
Merge-request: !2171
2018-06-27 15:10:56 -04:00
Zack Galbreath 71f27c04b0 ctest_submit: show headers as debug info
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.
2018-06-27 15:08:14 -04:00
Zack Galbreath 4464ef21da ctest_submit: Check CA file during CDASH_UPLOAD
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.
2018-06-27 15:08:14 -04:00
Matt Powley df2875b58d FindBoost: Update MSVC architecture check code style 2018-06-27 14:55:49 -04:00
Kitware Robot b142b72141 CMake Nightly Date Stamp 2018-06-27 00:01:05 -04:00
Daniel Wyatt 611ad19499 CPack/RPM: Use CMAKE_COMMAND to reference cmake executable
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).
2018-06-26 13:25:08 -04:00
Brad King 2ba71a11e3 Merge branch 'lexer-null' into release-3.12
Merge-request: !2174
2018-06-26 13:04:25 -04:00
Brad King b29842a818 ListFileLexer: Do not match null bytes in input
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
2018-06-26 11:54:34 -04:00
Brad King b2b3872f22 Merge branch 'FindMatlab-doc-mcr' into release-3.12
Merge-request: !2173
2018-06-26 11:28:40 -04:00
Brad King 27ae8d52d0 Help: Add 3.12 release note for FindMatlab MCR support
This release note was forgotten by commit v3.12.0-rc1~183^2 (FindMatlab:
Matlab Runtime Compiler support, 2018-04-29).
2018-06-26 11:12:19 -04:00
Kitware Robot d45d5e28ec CMake Nightly Date Stamp 2018-06-26 00:01:10 -04:00
Brad King 07cfb18f9d Merge branch 'release-3.12' 2018-06-25 10:21:10 -04:00
Brad King 2c36dabbee Merge topic 'libuv-new-version-file-location'
889033b5c6 FindLibUV: Also check uv/version.h for version detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2169
2018-06-25 10:20:38 -04:00
Brad King 7e283acde7 Merge branch 'libuv-new-version-file-location' into release-3.12
Merge-request: !2169
2018-06-25 10:17:38 -04:00
Raphael Kubo da Costa 889033b5c6 FindLibUV: Also check uv/version.h for version detection
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.
2018-06-25 10:16:46 -04:00
Brad King e9ec0cc3bb Merge topic 'update-kwsys'
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
2018-06-25 09:57:35 -04:00
Brad King 8848a1c07a Merge topic 'test-wizard'
7bffd71c3b Tests: Adopt wizard test in RunCMake.CommandLine

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2166
2018-06-25 09:56:56 -04:00
Brad King 268919069b Merge branch 'release-3.12' 2018-06-25 09:55:05 -04:00
Brad King ae153c6914 Merge topic 'vs-filter-default-toolset'
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
2018-06-25 09:54:11 -04:00
Brad King 383f29fd63 Merge topic 'file-GLOB-remove-new-errors'
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
2018-06-25 09:53:24 -04:00
Brad King 00523ad9c5 Merge branch 'vs-filter-default-toolset' into release-3.12
Merge-request: !2162
2018-06-25 09:39:30 -04:00
Kitware Robot 8e50de4dc5 CMake Nightly Date Stamp 2018-06-25 00:01:05 -04:00
Basil Fierz 3c4698da3a VS: Allow toolset version selection to specify default toolset
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
2018-06-24 10:36:03 -04:00
Kitware Robot daf472f9be CMake Nightly Date Stamp 2018-06-24 00:01:08 -04:00
Craig Scott 3f58967887 Merge topic 'cmake-buildsystem-manual-typo'
82956270ed Help: Fix typo in cmake-buildsystem(7) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2163
2018-06-23 17:20:50 -04:00
Kitware Robot 4b7e9cabc2 CMake Nightly Date Stamp 2018-06-23 00:01:13 -04:00
Brad King 7bffd71c3b Tests: Adopt wizard test in RunCMake.CommandLine
Avoid a whole separate test for one removed command-line option.
2018-06-22 13:59:14 -04:00
Brad King b41b30f16e Update use of KWSys SystemTools::SplitString for new signature 2018-06-22 13:38:18 -04:00
Brad King f2d97c1cdf Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-06-22 (49068d94)
2018-06-22 11:31:36 -04:00
KWSys Upstream 6d7fdedde6 KWSys 2018-06-22 (49068d94)
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
2018-06-22 11:31:35 -04:00
Basil Fierz b759f7068f cmVSSetupHelper: Expose default toolset version
We already detect the VS toolset version.  Expose it to clients.
2018-06-22 10:07:09 -04:00
Brad King d548994afc cmVSSetupHelper: Use in-class member initialization 2018-06-22 10:07:09 -04:00
Brad King 44ca3d922c Merge topic 'cpack-generator-documentation'
57e4c51e8a Help: Update old version release notes for CPack generator docs
4181830881 Help: Add release notes for CPack generator documentation and module updates
48bc8b2b82 CPack: Move internal implementation modules into Internal/CPack directory
2a2829cc75 Help: Add new section for CPack generators
be6267808a CPackIFW: Turn documentation into a block comment
0180524c7a Help: Move legacy CPack modules into separate section

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2149
2018-06-22 09:48:00 -04:00