Commit Graph

40821 Commits

Author SHA1 Message Date
Brad King
b57560bb0f Merge topic 'readme-build-docs'
af6f16f1e8 README: Explain how to build CMake with the docs
ae80271ed3 README: Fix typo (rm space).

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2466
2018-10-09 12:02:23 -04:00
Joachim Wuttke (o)
af6f16f1e8 README: Explain how to build CMake with the docs 2018-10-09 17:57:32 +02:00
Brad King
517cc8e1ef Merge branch 'release-3.13' 2018-10-09 10:16:35 -04:00
Brad King
6784acfbe0 CMake 3.13.0-rc1 v3.13.0-rc1 2018-10-09 09:04:28 -04:00
Brad King
d96aa16310 Merge branch 'release-3.13' 2018-10-09 09:03:52 -04:00
Brad King
afd5d17bac Merge topic 'FindBISON-fix-verbose-file'
c64797fa94 FindBISON: Fix "multiple rules generate" error on VERBOSE output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2467
2018-10-09 09:03:10 -04:00
Brad King
f6193d92fd Merge branch 'FindBISON-fix-verbose-file' into release-3.13
Merge-request: !2467
2018-10-09 09:01:21 -04:00
Brad King
c64797fa94 FindBISON: Fix "multiple rules generate" error on VERBOSE output
When `BISON_TARGET` is called with both

    VERBOSE <extra-file> REPORT_FILE <file>

we add a custom command to copy `<file>` to `<extra-file>`.  The change
in commit v3.7.1~10^2 (FindBISON: Do not rebuild every time when not
VERBOSE, 2016-11-14) incorrectly listed the extra file as an output of
the main bison invocation custom command, but it is actually produced by
the separate copy command.  Fix the logic to always generate `<file>` as
an output of the bison command and `<extra-file>` as an output of the
copy command.

Fixes: #18433
2018-10-09 08:55:54 -04:00
Brad King
577a9a88ad Merge branch 'release-3.13' 2018-10-09 07:43:14 -04:00
Brad King
03e381cb8a Merge topic 'string-TIMESTAMP-unset-TZ'
f23760ffac string(TIMESTAMP): Fix unset TZ

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Attila Krasznahorkay <attila.krasznahorkay@gmail.com>
Merge-request: !2464
2018-10-09 07:42:45 -04:00
Brad King
54f0ae5414 Merge branch 'string-TIMESTAMP-unset-TZ' into release-3.13
Merge-request: !2464
2018-10-09 07:33:56 -04:00
Jose Luis Blanco-Claraco
f23760ffac string(TIMESTAMP): Fix unset TZ
The logic added by commit v3.6.0-rc1~338^2 (CMake: Extend TIMESTAMP
sub-commands with new unix time format specifier, 2016-02-16) to restore
the `TZ` environment variable does not properly handle the case in which
the variable was originally not set.  Unset the variable in this case.

Fixes: #18431
2018-10-09 07:26:40 -04:00
Joachim Wuttke (o)
ae80271ed3 README: Fix typo (rm space). 2018-10-09 13:26:17 +02:00
Brad King
092a0b104a Merge branch 'release-3.13' 2018-10-09 06:35:20 -04:00
Brad King
efa5d5c781 Merge branch 'doc-regex-backslash' into release-3.13
Merge-request: !2460
2018-10-09 06:34:34 -04:00
Brad King
3ea9d81da6 Merge topic 'doc-regex-backslash'
fab2c2339b Help: Fix documentation of escape sequences in a regex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2460
2018-10-09 06:34:06 -04:00
Brad King
fab2c2339b Help: Fix documentation of escape sequences in a regex
Documentation added by commit 4b35dab891 (Help: Document how escape
sequences work in a regex, 2018-07-18) is only correct for backslashes
inside `[]` groups.  The regex engine does interpret `\` escapes
elsewhere.  Fix the docs.

Inspired-by: R2RT <artur.ryt@gmail.com>
Fixes: #18428
2018-10-09 06:31:37 -04:00
Brad King
92ed3b38cc Merge branch 'vs-flag-map-Qspectre' into release-3.13
Merge-request: !2462
2018-10-09 06:28:57 -04:00
Brad King
0e2799019f Merge branch 'mkl_ilp64' into release-3.13
Merge-request: !2444
2018-10-09 06:28:49 -04:00
Brad King
424851742e Merge topic 'mkl_ilp64'
d0fb3e6c52 Find{BLAS,LAPACK}: Find also ILP64 MKL BLAS and LAPACK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2444
2018-10-09 06:27:55 -04:00
Brad King
e9114f5bcf Merge topic 'vs-flag-map-Qspectre'
bb60ed6e72 VS: Add flag table entry for -Qspectre

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2462
2018-10-09 06:27:21 -04:00
Brad King
db8920a2c5 Merge topic 'doc-target_link_libraries-keywords-not-genex'
cd8c79e163 Help: Clarify target_link_libraries keywords and generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2449
2018-10-09 06:25:13 -04:00
Brad King
9df49ba020 Merge topic 'update-prebuilt-openssl'
ab6bf9d0ad Utilities/Release: Update to openssl-1.1.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2461
2018-10-09 06:24:34 -04:00
Kitware Robot
0ab5db035e CMake Nightly Date Stamp 2018-10-09 00:01:08 -04:00
Brad King
bb60ed6e72 VS: Add flag table entry for -Qspectre
Add special logic to map this flag to a top-level build setting
instead of being in ClCompile.

Fixes: #18426
2018-10-08 14:03:39 -04:00
Jakub Benda
d0fb3e6c52 Find{BLAS,LAPACK}: Find also ILP64 MKL BLAS and LAPACK
Modern Intel MKL packages offer 64-bit BLAS and LAPACK libraries in any
of the eight combinations of the following three binary options:

  - sequential or threaded
  - LP64 or ILP64
  - static or shared

The modules FindBLAS and FindLAPACK did not allow full selection of
arbitrary combination; in particular, only LP64 variant was used.

The original list of possible BLA_VENDOR values related to MKL,

  Intel10_64lp
  Intel10_64lp_seq

is thus extended by another pair of "vendors",

  Intel10_64ilp
  Intel10_64ilp_seq

Depending on the selection, either "_lp64", or "_ilp64" MKL libraries
are searched for. Some comments in the two CMake modules were modified
to indicate that even though the "vendors" contain the number "10",
they also apply to all further versions of MKL.
2018-10-08 13:21:08 -04:00
Brad King
c268fcc2ed Merge branch 'doc-target_link_libraries-keywords-not-genex' into release-3.13
Merge-request: !2449
2018-10-08 11:52:39 -04:00
Brad King
2b836a0121 Merge branch 'release-3.13' 2018-10-08 11:27:39 -04:00
Brad King
4422ee3cb2 Merge topic 'add_ctest_progress_docs'
2154ea38f9 Help: Add missing docs for the ctest --progress option
fb2cdf4d4c Help: Use :envvar: links for env vars affecting ctest command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Wegner <michael.t.wegner@gmail.com>
Merge-request: !2454
2018-10-08 11:26:52 -04:00
Brad King
c3e27c2562 Merge topic 'project-always-set-desc-url'
f8a086a86b project(): Ensure DESCRIPTION and HOMEPAGE_URL variables are set
b27247c8df project(): Add tests verifying variables set by second project() call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2457
2018-10-08 11:26:21 -04:00
Brad King
c76e024a3d Merge topic 'list-SORT-docs'
cdf8d79e9f Help: Improve/fix incorrect docs for list(SORT) sub-options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2453
2018-10-08 11:25:38 -04:00
Brad King
c2356d60d8 Merge branch 'project-always-set-desc-url' into release-3.13
Merge-request: !2457
2018-10-08 11:21:48 -04:00
Brad King
981cdceca2 Merge branch 'add_ctest_progress_docs' into release-3.13
Merge-request: !2454
2018-10-08 11:21:36 -04:00
Brad King
bad9bc78e3 Merge branch 'list-SORT-docs' into release-3.13
Merge-request: !2453
2018-10-08 11:21:23 -04:00
Brad King
cd8c79e163 Help: Clarify target_link_libraries keywords and generator expressions
The `optimized` and `debug` keyword items are meaningful only to
the `target_link_libraries` command and have no meaning when
produced by a generator expression.  State this explicitly.
Also recommend use of a quoted argument when the genex itself
may contain a semicolon.

Fixes: #18424
2018-10-08 11:18:14 -04:00
Brad King
f87b0be825 Merge branch 'release-3.13' 2018-10-08 11:11:41 -04:00
Brad King
27189b9658 Merge branch 'release-3.12' 2018-10-08 11:11:22 -04:00
Brad King
fcb47f4331 Merge topic 'UseSWIG-php-regression'
ecd0fec40b UseSWIG: fix regression for PHP language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2448
2018-10-08 11:10:59 -04:00
Brad King
20e14baae7 Merge topic 'autogen-moc-predef-cross-compile'
66f49d1f9a Android: Add clang --target= flag to compiler predefines command
39534c58c5 Autogen: Add clang --target= flag to compiler predefines command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: André Klitzing <aklitzing@gmail.com>
Merge-request: !2452
2018-10-08 11:10:19 -04:00
Brad King
c780f5eea7 Merge branch 'UseSWIG-php-regression' into release-3.13
Merge-request: !2448
2018-10-08 11:09:18 -04:00
Brad King
d92737821f Merge branch 'autogen-moc-predef-cross-compile' into release-3.13
Merge-request: !2452
2018-10-08 11:09:08 -04:00
Brad King
ab6bf9d0ad Utilities/Release: Update to openssl-1.1.1
Update the prebuilt binary build configurations for machines where
we build our own OpenSSL library to use a newer version.
2018-10-08 10:42:12 -04:00
Kitware Robot
e3666e8ffe CMake Nightly Date Stamp 2018-10-08 00:01:06 -04:00
Craig Scott
f8a086a86b project(): Ensure DESCRIPTION and HOMEPAGE_URL variables are set
If a project() call does not have DESCRIPTION or HOMEPAGE_URL
options, it must still set the relevant variables or else those variables will
inherit values from an earlier project() call. That is inconsistent with how
VERSION is handled and is likely to be unexpected. The docs were also
ambiguous about what should happen in such cases.
2018-10-08 08:28:17 +11:00
Craig Scott
b27247c8df project(): Add tests verifying variables set by second project() call 2018-10-08 08:28:01 +11:00
Craig Scott
2154ea38f9 Help: Add missing docs for the ctest --progress option
These docs were missing from the changes that introduced the feature in
!2240.
2018-10-07 17:03:36 +11:00
Craig Scott
fb2cdf4d4c Help: Use :envvar: links for env vars affecting ctest command 2018-10-07 17:03:36 +11:00
Kitware Robot
f0c8d162f5 CMake Nightly Date Stamp 2018-10-07 00:01:05 -04:00
Craig Scott
cdf8d79e9f Help: Improve/fix incorrect docs for list(SORT) sub-options 2018-10-06 18:10:38 +10:00
Kitware Robot
342551be71 CMake Nightly Date Stamp 2018-10-06 00:01:10 -04:00