Commit Graph
47352 Commits
Author SHA1 Message Date
Brad King 45d5abf4a8 Merge branch 'backport-3.15-install-default-fix' 2020-02-11 14:58:08 -05:00
Brad King 93c0fc5b28 Merge branch 'release-3.16' 2020-02-11 14:54:14 -05:00
Brad King 44a698cd45 Merge branch 'release-3.15' into release-3.16 2020-02-11 14:53:47 -05:00
Brad King 0a4d829c36 Merge branch 'backport-3.14-install-default-fix' 2020-02-11 14:50:31 -05:00
Kyle Edwards b519db6217 install: Fix regression when using default destinations
In commit 9fc20a4f3e (install: Add sane set of defaults for DESTINATION
and file type parameters, 2018-11-02, v3.14.0-rc1~410^2~1), a regression
was introduced, in which an `install(TARGETS)` with a
RUNTIME/LIBRARY/ARCHIVE DESTINATION but no PUBLIC_HEADER/PRIVATE_HEADER
DESTINATION would then install the headers.  The old behavior did not do
this.  Restore the old behavior.

Fixes: #20326
2020-02-11 14:12:33 -05:00
Kyle Edwards b4b60d1c3a install: Fix regression when using default destinations
In commit 9fc20a4f3e (install: Add sane set of defaults for DESTINATION
and file type parameters, 2018-11-02, v3.14.0-rc1~410^2~1), a regression
was introduced, in which an `install(TARGETS)` with a
RUNTIME/LIBRARY/ARCHIVE DESTINATION but no PUBLIC_HEADER/PRIVATE_HEADER
DESTINATION would then install the headers.  The old behavior did not do
this.  Restore the old behavior.

Fixes: #20326
2020-02-11 14:05:40 -05:00
Michael Hirsch, Ph.D 88cffab75f FindHDF5: docs
The docs referred to deprecated variables and HDF5_ROOT, which is
implicit for every Find*.
2020-02-11 11:11:42 -05:00
Kyle Edwards 46c836644d Ninja Multi-Config: Fix issue with "all" in CMAKE_NMC_DEFAULT_CONFIGS
Prior to this fix, CMAKE_NMC_DEFAULT_CONFIGS would inherit "all" from
the union of CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG and
CMAKE_NMC_CROSS_CONFIGS. This is inconsistent with the behavior of the
"all" target signifying CMAKE_NMC_CROSS_CONFIGS. Update "all" in
CMAKE_NMC_DEFAULT_CONFIGS to inherit only from CMAKE_NMC_CROSS_CONFIGS.
2020-02-11 10:49:54 -05:00
Joachim Wuttke (o) e240371ab1 Help: CPackIFWGenerator: explain relation to CPackIWF
* Make overview more focussed
* Explain the relation to CPackIFW
2020-02-11 10:47:26 -05:00
Joachim Wuttke (o) 78779c6111 Help: Show external link only once per page; explain abbreviation QtIFW. 2020-02-11 10:47:26 -05:00
Michael Hirsch, Ph.D 659e46b99b FindHDF5: Improve search when not using HDF5 compiler wrapper
Add common lib/inc path_suffixes.
2020-02-11 10:42:41 -05:00
Michael Hirsch, Ph.D d9e39f3f89 FindHDF5: check that compiler wrapper can compile a minimal program
There are common setups where the compiler wrapper is broken and will
give non-useful flags to CMake.
2020-02-11 10:42:41 -05:00
Brad King 6e14fe4d1f Merge branch 'release-3.16' 2020-02-11 09:10:04 -05:00
Brad King 452cf03ef9 Merge branch 'release-3.17' 2020-02-11 09:08:39 -05:00
Brad King f104115b3d Merge topic 'link-line-backtrace'
8752c1bd64 Merge branch 'backport-3.16-link-line-backtrace'
e756328434 Propagate backtraces from LINK_LIBRARIES through to link line items

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Dennis Klein <d.klein@gsi.de>
Merge-request: !4344
2020-02-11 09:08:39 -05:00
Brad King 0db0b72156 Merge topic 'link-line-backtrace' into release-3.17
8752c1bd64 Merge branch 'backport-3.16-link-line-backtrace'
e756328434 Propagate backtraces from LINK_LIBRARIES through to link line items

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Dennis Klein <d.klein@gsi.de>
Merge-request: !4344
2020-02-11 09:08:38 -05:00
Shane Parris 818ec34bdd file: GLOB_RECURSE VerifyGlobs.cmake should have CMP0009 set to new
In certain cases, rebuilds with CMake using the CONFIGURE_DEPENDS flag
with GLOB_RECURSE could result in a reconfigure loop due to CMP0009 not
being propogated to the generated VerifyGlobs.cmake script.

During the inital configuration phase, RecurseThroughSymlinksOn() is
called for recursive glob operations either by having the CMP0009 status
not set to NEW or by explicitly providing the FOLLOW_SYMLINKS flag. At
the end when the VerifyGlobs script is created, the FOLLOW_SYMLINKS flag
is written according to the final resolved form through a call to
GetRecurseThroughSymlinks(). Thus, setting CMP0009 to NEW in the
generated file is safe and allows correct behavior whether or not the
end user sets the policy status to NEW or OLD.
2020-02-11 08:45:35 -05:00
Shane Parris b620dc566d file: Fix GLOB_RECURSE LIST_DIRECTORIES documentation regarding CMP0009 2020-02-11 08:45:35 -05:00
Shane Parris 715f90bdd9 Tests: Perform minor cleanups in RunCMake.file test 2020-02-11 08:45:35 -05:00
Kyle Edwards 9442ae5083 install: Fix regression when using default destinations
In commit 9fc20a4f3e (install: Add sane set of defaults for DESTINATION
and file type parameters, 2018-11-02, v3.14.0-rc1~410^2~1), a regression
was introduced, in which an `install(TARGETS)` with a
RUNTIME/LIBRARY/ARCHIVE DESTINATION but no PUBLIC_HEADER/PRIVATE_HEADER
DESTINATION would then install the headers.  The old behavior did not do
this.  Restore the old behavior.

Fixes: #20326
2020-02-11 08:34:16 -05:00
Brad King b0a9029e42 Merge branch 'release-3.17' 2020-02-11 08:26:35 -05:00
Brad King a55d0c11d6 Merge topic 'ExternalProject-submodules-recurse' into release-3.17
0ba8010255 ExternalProject: Fix git submodule recursion on update

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4346
2020-02-11 08:26:35 -05:00
Brad King bbb3de909d Merge topic 'ExternalProject-submodules-recurse'
0ba8010255 ExternalProject: Fix git submodule recursion on update

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4346
2020-02-11 08:26:35 -05:00
Brad King 00cd7269e1 Merge topic 'FindOpenMP-clang-windows' into release-3.17
ceb5ee4a7b FindOpenMP: Add support for Clang on Windows
2dbff623f9 FindOpenMP: Save flags/libs in cache entries each time they are detected

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4327
2020-02-11 08:22:49 -05:00
Brad King f548e4bf60 Merge branch 'release-3.17' 2020-02-11 08:22:49 -05:00
Brad King d5fd396110 Merge topic 'FindOpenMP-clang-windows'
ceb5ee4a7b FindOpenMP: Add support for Clang on Windows
2dbff623f9 FindOpenMP: Save flags/libs in cache entries each time they are detected

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4327
2020-02-11 08:22:49 -05:00
Brad King 5c81c72747 Merge branch 'release-3.17' 2020-02-11 08:21:07 -05:00
Brad King 29423cde11 Merge topic 'FindPython-reduce-resources-comsumption'
3dab4682f6 FindPython: reduces consumption of resources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4338
2020-02-11 08:21:07 -05:00
Brad King bdd4fb32ad Merge topic 'FindPython-reduce-resources-comsumption' into release-3.17
3dab4682f6 FindPython: reduces consumption of resources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4338
2020-02-11 08:21:06 -05:00
Brad King d022c3aa84 Merge branch 'release-3.17' 2020-02-11 08:20:03 -05:00
Brad King 8e39e0c3e3 Merge topic 'swift-no-sdk-include' into release-3.17
5c2a92f44f Swift: Exclude SDK include paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4315
2020-02-11 08:20:03 -05:00
Brad King 961d932a1b Merge topic 'swift-no-sdk-include'
5c2a92f44f Swift: Exclude SDK include paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4315
2020-02-11 08:20:03 -05:00
Brad King 9ac2001e37 Merge branch 'release-3.17' 2020-02-11 08:17:46 -05:00
Brad King 783f4720f5 Merge topic 'FindMPI-fix-rerun' into release-3.17
b4d5ea8233 FindMPI: Preserve order of include directories on re-runs of CMake
8261ee3a9c FindMPI: Restore re-construction of include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4341
2020-02-11 08:17:45 -05:00
Brad King a63f1c5c03 Merge topic 'FindMPI-fix-rerun'
b4d5ea8233 FindMPI: Preserve order of include directories on re-runs of CMake
8261ee3a9c FindMPI: Restore re-construction of include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4341
2020-02-11 08:17:45 -05:00
Brad King 31b2cc6187 Merge topic 'rel-test-python'
7253b49ca9 Utilities/Release: Use python 3 for tests on Windows binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4339
2020-02-11 08:16:38 -05:00
Brad King bdc04fd33a Merge topic 'fileapi-test-breakup'
75e71263e7 FileAPI test: Break gen_check_projects() into JSON files
a0de350e2f FileAPI test: Break gen_check_targets() into JSON files
de8ebc9dba FileAPI test: Break gen_check_directories() into JSON files
1605fcbbd9 FileAPI test: Add infrastructure for reading JSON test data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4333
2020-02-11 08:15:49 -05:00
Ben Boeckel 6e65b869c3 cmNinjaTargetGenerator: cmStrCat usage 2020-02-11 03:55:50 -05:00
Ben Boeckel 9f6544048f cmGlobalNinjaGenerator: cmStrCat usage 2020-02-11 03:55:50 -05:00
Ben Boeckel 04ac0ea501 cmGlobalNinjaGenerator: factor out /all target name computation 2020-02-11 03:55:50 -05:00
Ben Boeckel a85bea173a cmGlobalNinjaGenerator: avoid unnecessary string addition 2020-02-11 03:55:50 -05:00
Kitware Robot d31f31714b CMake Nightly Date Stamp 2020-02-11 00:01:09 -05:00
Charis Marangos 0ba8010255 ExternalProject: Fix git submodule recursion on update
In commit 5bc6230741 (ExternalProject: Option to turn off recursive
update of git submodules, 2019-10-16) we implemented the feature in the
clone script written by `_ep_write_gitclone_script` but not in the
update script written by `_ep_write_gitupdate_script`.  Implement the
latter by factoring out a common helper to use in both places.

Fixes: #20335
2020-02-11 10:14:42 +11:00
Tim Hutton ceb5ee4a7b FindOpenMP: Add support for Clang on Windows
Fixes: #19404
2020-02-10 17:20:19 -05:00
Tim Hutton 2dbff623f9 FindOpenMP: Save flags/libs in cache entries each time they are detected 2020-02-10 17:20:19 -05:00
Brad King 37fa69202e Merge branch 'backport-3.16-link-line-backtrace' into release-3.16
Merge-request: !4344
2020-02-10 16:18:22 -05:00
Brad King 8752c1bd64 Merge branch 'backport-3.16-link-line-backtrace' 2020-02-10 16:17:03 -05:00
Brad King e756328434 Propagate backtraces from LINK_LIBRARIES through to link line items
Since commit d4d0dd0f6a (cmLinkLineComputer: Add ComputeLinkLibs
overload with backtraces, 2019-09-13, v3.16.0-rc1~87^2~4), backtraces
have been collected by `ComputeLinkLibs` by looking back through the
link implementation libraries for one matching the text of the link line
item.  This is slow in projects with long link lines.

Instead, teach `cmComputeLinkDepends` and `cmComputeLinkInformation` to
carry backtrace information explicitly along with the text of each item.

Fixes: #20322
2020-02-10 16:11:38 -05:00
Brad King b4d5ea8233 FindMPI: Preserve order of include directories on re-runs of CMake
The fix in commit 5861c6d450 (FindMPI: Preserve include order when
extracting component directories, 2019-12-19) only works on the first
run of CMake in which we find MPI.  Extend the fix to save the compiler
wrapper's entire include path in our cache without splitting anything
out.  That way we can preserve the order when CMake re-runs.

Fixes: #20338
2020-02-10 11:14:42 -05:00
Brad King 8261ee3a9c FindMPI: Restore re-construction of include directories
The fix in commit 5861c6d450 (FindMPI: Preserve include order when
extracting component directories, 2019-12-19) only works on the first
run of CMake in which we find MPI.  It preserves the include directories
on the first run but still splits them up and saves the pieces in the
cache.  On future runs the pieces are not re-assembled, and we do not
know the order anyway.

Restore the re-assembly step so that at least all the include dirs are
available.  Leave preservation of the original order to later work.

Issue: #20338
2020-02-10 11:10:29 -05:00