Commit Graph

40092 Commits

Author SHA1 Message Date
Brad King f4d4d5df5b Merge topic 'LINK_DEPENDS'
724bd7790e LINK_DEPENDS: add support of 'generator expressions'
cc9f88af53 LINK_DEPENDS: add support for property INTERFACE_LINK_DEPENDS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2175
2018-07-03 10:52:24 -04:00
Brad King 5d933ad77b Merge branch 'release-3.12' 2018-07-03 10:48:46 -04:00
Brad King 83db42fa99 Merge topic 'cpack-fix-deb-packaging'
2774259100 CPack/Deb: Restore setting of root as the owner of files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2178
2018-07-03 10:48:03 -04:00
Brad King 3017e501f3 Merge topic 'rel-explicit-ccmake'
eb63a07eaa Utilities/Release: Explicitly enable ccmake on macOS and Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2186
2018-07-03 10:46:51 -04:00
Daniel Franke 5dbee9d2d0 math: Add options to calculate and format output as hexadecimal 2018-07-03 09:55:58 -04:00
Brad King 0d7114987c Revert "target_link_libraries: Allow use with targets in other directories"
Revert commit v3.12.0-rc1~82^2 (target_link_libraries: Allow use with
targets in other directories, 2018-05-11).  The RHS target scoping and
visibility rules are not clear and will need further investigation
before the feature can be added.

Issue: #17943
2018-07-03 09:39:28 -04:00
Kitware Robot b49b4066c0 CMake Nightly Date Stamp 2018-07-03 00:01:06 -04:00
David Benjamin cb694f8cd6 VS: Properly quote arguments in nasm.xml
Most arguments were quoted, but some weren't, causing problems if the
arguments contained whitespace.

In particular, the _STL_EXTRA_DISABLED_WARNINGS value takes spaces and
CMake's NASM support applies all add_definitions lines to NASM. The -D
flag is missing quotes, so projects using NASM and setting
_STL_EXTRA_DISABLED_WARNINGS break in the Visual Studio generator.

Likewise, the -o flag is missing quotes, which means filenames with
spaces do not work.

(The -U flag is unlikely to need quotes, but include them for
consistency.)

Extend the existing VSNASM test to cover these cases.
2018-07-02 18:50:12 -04:00
Brad King 39851a6d43 Merge branch 'cpack-fix-deb-packaging' into release-3.12
Merge-request: !2178
2018-07-02 13:19:54 -04:00
Andrew Fuller 2774259100 CPack/Deb: Restore setting of root as the owner of files
Refactoring in commit v3.10.0-rc1~220^2 (cmCPackDebGenerator: Use
libarchive to create .deb file) accidentally broke this for the
top-level archive.
2018-07-02 13:17:43 -04:00
Brad King 8ad3396158 Merge topic 'policy_max_docs'
19f338109d Help: Clarify ...<max> behavior for policy-related commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2180
2018-07-02 11:48:56 -04:00
Brad King ea6ad5e4be Merge branch 'policy_max_docs' into release-3.12
Merge-request: !2180
2018-07-02 11:48:00 -04:00
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
Kyle Edwards 4c71548766 Help: Add release notes for CPack External generator 2018-07-02 09:51:02 -04:00
Kyle Edwards 47c87cdd1f Help: Add documentation for CPack External generator 2018-07-02 09:51:02 -04:00
Kyle Edwards 2ef966bc77 Testing: Add test for CPack External generator
This test case ensures that the CPack External generator produces
the proper .json file, and also ensures that the version negotation
with CPACK_EXT_REQUESTED_VERSIONS works properly.
2018-07-02 09:51:02 -04:00
Kyle Edwards 80914d88da CPack: Add "CPack External" generator
This generator doesn't actually package the files. Instead, it
provides a metadata JSON file that can be used by external packaging
software to do its own packaging. This JSON file provides information
about the components, component groups, installation types, and CMake
projects.
2018-07-02 09:51:02 -04:00
Kyle Edwards 3ced881db6 cmCPackGenerator: Store CPACK_INSTALL_CMAKE_PROJECTS in an internal field
By storing this information in an internal field in the class, it
can be used later on by generators that need it.
2018-07-02 09:51:02 -04:00
Kyle Edwards 4938abb600 cmCPackGenerator: Refactor InstallProjectViaInstallCMakeProjects()
This refactoring will allow cmCPackExtGenerator to skip the install
step while still gathering up information about the CPack components
and groups. Besides, this function was too long, and needed to be
broken up anyway.
2018-07-02 09:51:02 -04:00
Sebastian Holtermann 42cc0644d5 Autogen: Use default and remove custom GetSafeProperty functions 2018-07-02 12:53:44 +02:00
Sebastian Holtermann 127094f2f0 Add GetSafeProperty method to cmTarget, cmGeneratorTarget and cmSourceFile 2018-07-02 12:39:54 +02:00
Kitware Robot 752c2721a1 CMake Nightly Date Stamp 2018-07-02 00:01:04 -04:00
Craig Scott 19f338109d Help: Clarify ...<max> behavior for policy-related commands
Affects cmake_minimum_required() and cmake_policy(VERSION)
2018-07-02 08:41:46 +10: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
Marc Chevrier 724bd7790e LINK_DEPENDS: add support of 'generator expressions' 2018-06-27 18:38:36 +02:00
Marc Chevrier cc9f88af53 LINK_DEPENDS: add support for property INTERFACE_LINK_DEPENDS
Fixes: #17997
2018-06-27 18:38:36 +02:00
Kitware Robot b142b72141 CMake Nightly Date Stamp 2018-06-27 00:01:05 -04:00
Daniel Franke 8661e7052c math: Diagnose divide-by-zero 2018-06-26 14:21:18 -04:00
Daniel Franke 7c4c13ffef math: Reject unexpected expression input explicitly
Switch to C++ exceptions for lexer/parser error handling.
Teach the lexer/parser to fail on unexpected input.
2018-06-26 14:15:21 -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