Commit Graph
47352 Commits
Author SHA1 Message Date
Joachim Wuttke (h) fe8acf7c05 Help: 3 subtypes of boolean generator expressions.
Main classification by return type,
subclassification by dependences
2018-11-06 12:55:23 +01:00
Joachim Wuttke (h) 9891adf74b Help: Cross-link conditional and boolean expressions.
Rename Logical -> Boolean Generator Expressions.
It's the return type that helps us to sort the expression zoo.
2018-11-06 12:55:23 +01:00
Joachim Wuttke (h) 20b6561e78 Help: new section on conditional generator expressions
Before, the closely related signatures
  $<condition:true_value>
  $<IF:condition,true_value,false_value>
were explained in two different sections.  The former section
was badly explained, with '0' and '1' in place of the formal
parameter 'condition'.
2018-11-06 12:55:23 +01:00
Joachim Wuttke (h) 873e59c0c4 Help: rm unmotivated "This means that"
That generator expressions enable conditional things
has not been said before.

Amended for nicer source format.
2018-11-06 12:55:23 +01:00
Joachim Wuttke (h) b2a798fe32 Help: expand "ver", "pol", ...
No need to save a few characters on formal parameters.

Use this occasion to correct $<PLATFORM_ID:comp>:
the parameter is a platform_id, not a compiler_id.
2018-11-06 12:55:23 +01:00
Joachim Wuttke (h) db749f404c Help: expand "..." and "?" in logical generator expressions
Expand "..." and "?", which could be mistaken as metacharacters
(and in the explanations of AND and OR actually were meant as
metacharacters).
2018-11-06 12:55:23 +01:00
Craig Scott 12deb051b3 Help: Use correct CPack generator names
CPack generator names were not used consistently
throughout the documentation, resulting in ambiguity
about what the correct name was for use with the
`cpack -G` option. With the changes in this commit, the
cpack-generators(7) page of the manual now shows the
correct names and other help pages no longer use
inconsistent or incorrect names.
2018-11-06 16:42:38 +11:00
Kitware Robot 44760059fc CMake Nightly Date Stamp 2018-11-06 00:01:08 -05:00
Brad King 3f22656d8c Merge branch 'backport-FindBoost-explicit-arch-tag' 2018-11-05 11:45:58 -05:00
Ben Boeckel 575e2cc35d FindPostgreSQL: extract the actual version number
The `PG_VERSION` variable can be mangled by distributions to indicate
things like the name of the distro and package build numbers.

However, `PG_VERSION_NUM` is new in 8.2 (2006), so keep the old
extraction code around for old versions.
2018-11-05 11:13:33 -05:00
Brad King 1e08b625c2 FindBoost: Add explicit Boost_ARCHITECTURE option
Boost 1.66 and above built with `--layout=versioned` add an architecture
tag to the library file names.  We already try to compute this tag
automatically when `CMAKE_CXX_COMPILER_ARCHITECTURE_ID` is available,
but that is currently not computed everywhere.  Add an explicit
`Boost_ARCHITECTURE` option that a user can set to specify the
architecture tag.

Issue: #17701
2018-11-05 10:55:15 -05:00
R2RT 53a5aec899 CMP0053: Fix double warning on uninitialized variables in -P mode
When `CMP0053` is not set to OLD or NEW then we compute both variants
in case we need to warn about a behavior change.  Do not allow both
code paths to produce an uninitialized variable warning.

Fixes: #18552
2018-11-05 08:31:09 -05:00
R2RT f92f93467e cmMakefile: Rename SuppressWatches to SuppressSideEffects 2018-11-05 08:29:10 -05:00
Brad King fe997d80e0 Merge branch 'blaslapack95' into release-3.13
Merge-request: !2560
2018-11-05 08:11:13 -05:00
Sebastian Holtermann 47f9c15c60 Autogen: Update <ORIGIN>_autogen target documentation 2018-11-05 14:03:01 +01:00
Sebastian Holtermann 336893d9eb Autogen: Separate AUTOGEN_TARGET_DEPENDS tests into own tests suite
The tests for AUTOGEN_TARGET_DEPENDS were part of the
AutogenOriginDependsOn tests suite.  This separates them
into an own AutogenTargetDepends tests suite.
2018-11-05 14:03:01 +01:00
Jakub Benda f1a3e4eca8 FindLAPACK: Correct library name and symbol searched in LAPACK95 wrapper
The symbol "CHEEV", originally used to determine if a library provides
Fortran 95 wrappers for LAPACK, has been replaced by "cheev_f95". "CHEEV"
is provided by libmkl_intel_(i)lp64, which does not provide the generic
Fortran 95 wrappers. Instead, libmkl_lapack95_(i)lp64 does; one of the
specializations of the type-generic interfaces contained in that library
is "lapack_f95".

Also, FindLAPACK used libmkl_intel_(i)lp64 instead of the correct
libmkl_lapack95_(i)lp64 library for LAPACK95 functionality. This has
been fixed, too.
2018-11-05 08:00:02 -05:00
Jakub Benda 970b18e9a5 FindBLAS: Correct symbol searched in BLAS95 wrapper
The symbol "SGEMM", originally used to determine if a library provides
Fortran 95 wrappers for BLAS, has been replaced by "sgemm_f95". "SGEMM"
is provided by libmkl_intel_(i)lp64, which does not provide the generic
Fortran 95 wrappers. Instead, libmkl_blas95_(i)lp does; one of the
specializations of the type-generic interfaces contained in that library
is "sgemm_f95".
2018-11-05 08:00:02 -05:00
Craig Scott 20d5e77a27 CPack: Rename Ext generator to External
Ext and External were used inconsistently in the code and the
docs. This change converts all uses of Ext to External, including
within variable names used by the generator.
2018-11-05 07:56:03 -05:00
Brad King e5d298b8fd Merge topic 'lwyu-hides-link-error'
85aceda026 cmNinjaNormalTargetGenerator: don't use `|| true` for link-what-you-use

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2546
2018-11-05 07:50:20 -05:00
Brad King 066db7576d Merge branch 'release-3.13' 2018-11-05 07:49:06 -05:00
Brad King 36280e6157 Merge branch 'custom-command-work-dir-genex' into release-3.13
Merge-request: !2559
2018-11-05 07:48:39 -05:00
Brad King 4cd059480a Merge branch 'update-curl' into release-3.13
Merge-request: !2550
2018-11-05 07:48:22 -05:00
Brad King b83420e45d Merge topic 'update-curl'
c1ad5118de curl: backport upstream fix to 7.62.0 regression
03bf934fbe curl: Modernize tiny test code used for build inside CMake
2b3c1bb9b0 curl: Update build within CMake to account for 7.62 changes
636bcefeab Merge branch 'upstream-curl' into update-curl
9835e90750 curl 2018-10-30 (19667715)
9c6574795c curl: Update script to get curl 7.62.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2550
2018-11-05 07:43:41 -05:00
Brad King 259292ebcc Merge topic 'custom-command-work-dir-genex'
98d59417b0 add_custom_{command,target}: Fix WORKING_DIRECTORY leading genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2559
2018-11-05 07:42:47 -05:00
Kitware Robot 95894a605e CMake Nightly Date Stamp 2018-11-05 00:01:52 -05:00
Craig Scott 4961092cad Merge branch 'release-3.13' 2018-11-05 12:06:29 +11:00
Craig Scott 03d00d63df Merge branch 'cpack-gen-docs-link' into release-3.13
Merge-request: !2562
2018-11-05 12:04:40 +11:00
Craig Scott aa78b61bbc Merge topic 'cpack-gen-docs-link'
c12eefa8fd Help: Fix generators link in cpack(1) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2562
2018-11-04 20:01:08 -05:00
Kitware Robot 112100da90 CMake Nightly Date Stamp 2018-11-04 00:01:06 -04:00
Craig Scott c12eefa8fd Help: Fix generators link in cpack(1) manual
Minor rewording around the updated link and extra blank line
added to improve readability and remove a potential
ambiguity around the same area.

Fixes: #18545
2018-11-04 08:50:22 +11:00
Brad King 98d59417b0 add_custom_{command,target}: Fix WORKING_DIRECTORY leading genex
Since commit v3.13.0-rc1~39^2 (add_custom_{command,target}:
WORKING_DIRECTORY generator expressions, 2018-09-22) the
`WORKING_DIRECTORY` option accepts generator expressions.
Fix support for the case of a leading generator expression
by deferring conversion to an absolute path until after
evaluation of the generator expression.

Fixes: #18543
2018-11-03 08:39:45 -04:00
Sebastian Holtermann 846043dd35 Autogen: Rename MocDepends test to AutogenOriginDependsOn 2018-11-03 12:14:40 +01:00
Sebastian Holtermann b71a9598a4 Autogen: Add test for AUTOGEN_ORIGIN_DEPENDS=OFF 2018-11-03 12:14:40 +01:00
Sebastian Holtermann f74c406501 Autogen: Add (CMAKE_)AUTOGEN_ORIGIN_DEPENDS release notes 2018-11-03 12:14:40 +01:00
Sebastian Holtermann 0669de5d36 Autogen: Add (CMAKE_)AUTOGEN_ORIGIN_DEPENDS documentation 2018-11-03 12:14:40 +01:00
Sebastian Holtermann b5e895b5d4 Autogen: Add (CMAKE_)AUTOGEN_ORIGIN_DEPENDS support
This adds

- the variable ``CMAKE_AUTOGEN_ORIGIN_DEPENDS`` which initializes
- the target property ``AUTOGEN_ORIGIN_DEPENDS``

which controls whether or not the origin target dependencies
should be forwarded to the corresponding ``_autogen`` target.

The default value of ``CMAKE_AUTOGEN_ORIGIN_DEPENDS`` is ``ON``
which corresponds to the behavior that is in place since CMake 3.9.

Closes: #18493
2018-11-03 12:14:40 +01:00
Kitware Robot 443c574a7c CMake Nightly Date Stamp 2018-11-03 00:01:09 -04:00
Ben Boeckel 85aceda026 cmNinjaNormalTargetGenerator: don't use || true for link-what-you-use
With the `|| true`, a linker error before running link-what-you-use
would also use the `|| true` fragment and unconditionally succeed. Just
skip the addition since `--lwyu=` ignores the return value anyways.

Fixes #18524
2018-11-02 10:25:56 -04:00
Brad King 0730fb5c44 Merge branch 'release-3.12' 2018-11-02 09:25:14 -04:00
Brad King c1ad5118de curl: backport upstream fix to 7.62.0 regression
Backport upstream curl commit 2c5ec339ea (Curl_follow: accept
non-supported schemes for "fake" redirects, 2018-11-01) to get
a fix to curl issue 3210, a regression in 7.62.0.
2018-11-02 08:14:12 -04:00
Brad King 3a77329c40 CMake 3.12.4 v3.12.4 2018-11-02 08:05:07 -04:00
Brad King bdc5618e18 Merge topic 'FindGDAL-target'
22ba9b6a32 FindGDAL: set the GDAL_VERSION
525ff0c3bc Tests/FindGDAL: add a test for FindGDAL
87324b9b6a FindGDAL: add an imported target
dfb3f58f79 FindGDAL: Modernize documentation layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2552
2018-11-02 07:57:54 -04:00
Brad King a052479a5c Merge topic 'msvc-custom-rc-mt'
bd9bfc6449 MSVC: Respect CMAKE_RC_COMPILER and CMAKE_MT in vs_link_{dll,exe}
0033676796 CUDA: Enable RC language on Windows
02f566a559 MSVC: Factor out enable_language(RC) call into helper macro
b601bb6f1c CUDA: Find CMAKE_LINKER on Windows
3eebe28ef4 cmLocalNinjaGenerator: Simplify CreateRulePlaceholderExpander

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2424
2018-11-02 07:57:06 -04:00
Brad King 9578c3f0d1 Merge topic 'check-keywords-only-if-used'
4babc9058a cmTargetPropCommandBase: check keywords after parsing
45a49ae58a cmTargetPropCommandBase: simplify code path
9f64974f5e cmTargetPropCommandBase: skip property setting if there's nothing to add
4201a11c2b Tests: add tests for empty-value keyword arguments in target_*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2514
2018-11-02 07:55:14 -04:00
Brad King 08da4f8d70 Merge topic 'FindBoost-exact-version'
9855a80fd4 FindBoost: search default path if Boost_FIND_VERSION_EXACT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2543
2018-11-02 07:53:22 -04:00
Brad King bacb20a336 Merge branch 'release-3.13' 2018-11-02 07:49:13 -04:00
Brad King 34e011748e Merge branch 'release-3.12' 2018-11-02 07:48:59 -04:00
Brad King c384fc3ca4 Merge topic 'server-file-monitor-check'
eb52529ff4 server: Fix assertion failure on directory paths in file monitor

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2556
2018-11-02 07:48:34 -04:00
Kitware Robot fa5e5550f3 CMake Nightly Date Stamp 2018-11-02 00:01:13 -04:00