Commit Graph

11287 Commits

Author SHA1 Message Date
Brad King 016c71c681 Merge topic 'intel-fortran-nofor-main'
2a5955ac09 Intel: Replace deprecated Fortran flag -nofor_main with -nofor-main

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5729
2021-01-25 11:40:14 -05:00
Brad King adaa393115 Merge topic 'cpack-deb-shlibdeps-private-search-dirs'
d586a4ad60 CPackDeb: dpkg-shlibdeps now supports searching for private shared libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5718
2021-01-25 11:39:39 -05:00
Brad King 2a5955ac09 Intel: Replace deprecated Fortran flag -nofor_main with -nofor-main
The `-nofor_main` flag was originally added by commit ccdd3e943d (Fix
Intel Fortran SHARED libraries on Linux, 2009-10-27, v2.8.2~915).  Since
then, Intel Fortran renamed the option to `-nofor-main` and deprecated
the old name.  The new name has been available for a long time, so
we can just switch to it.

Fixes: #21735
2021-01-22 09:38:57 -05:00
Brad King 6bd251ace7 Merge topic 'SWIG-dependencies'
89b01b04fa UseSWIG: use swig tool to generate dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5724
2021-01-22 08:39:09 -05:00
Brad King 5a1b257fe7 Merge topic 'msvc-arm64ec-platform-support'
4ea3a88625 MSVC: Add support for targeting ARM64EC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5708
2021-01-22 08:38:21 -05:00
Deniz Bahadir d586a4ad60 CPackDeb: dpkg-shlibdeps now supports searching for private shared libs
The new CPack variable `CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS`
can be set to a list of directories. If `CPACK_DEBIAN_PACKAGE_SHLIBDEPS`
or `CPACK_DEBIAN_<component>_PACKAGE_SHLIBDEPS` are set to `ON` these
directories will be searched by `dpkg-shlibdeps` in order to find
private shared library dependencies of the libraries/executables that
shall be packed.
2021-01-22 08:33:01 -05:00
Marc Chevrier 89b01b04fa UseSWIG: use swig tool to generate dependencies
add_custom_command() supports option DEPFILE when generator is
Makefiles or Ninja. And swig tool is able to generate a dependencies
file which is compatible with DEPFILE option.
2021-01-21 19:29:04 +01:00
Brad King c69567e56a Merge topic 'FindGit-cache-version'
76fdeb6d13 Tests: FindGit already provides the git version, re-use it
315a200f0c FindGit: Cache the GIT_EXECUTABLE version for the current run

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5712
2021-01-21 09:27:04 -05:00
Brad King 8cdb9de586 Merge topic 'cuda-archs'
92854bf29e CUDA: Update arch selection, restructure for maintainability
a58a572459 CUDA: Add arch selection debug mode to print out CUDA versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5719
2021-01-21 09:19:23 -05:00
Brad King 7838a065a6 Merge topic 'FindHDF5-silence-output' into release-3.19
b924669385 FindHDF5: silence STATUS messages when found with QUIET
2439a048b0 FindHDF5: avoid writing to the output when testing h5cc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5722
2021-01-21 09:17:39 -05:00
Brad King 89430f4604 Merge topic 'FindHDF5-silence-output'
b924669385 FindHDF5: silence STATUS messages when found with QUIET
2439a048b0 FindHDF5: avoid writing to the output when testing h5cc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5722
2021-01-21 09:17:39 -05:00
Brad King 6bf23b2755 Merge topic 'macos-include-weak-dependencies'
7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected
f2d92b983b GetPrerequisites: Include weak macOS dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5703
2021-01-21 09:16:37 -05:00
Moyo Okeremi 😊 4ea3a88625 MSVC: Add support for targeting ARM64EC 2021-01-20 16:43:35 -08:00
Ben Boeckel b924669385 FindHDF5: silence STATUS messages when found with QUIET 2021-01-20 14:05:14 -05:00
Ben Boeckel 2439a048b0 FindHDF5: avoid writing to the output when testing h5cc
The execution of this tool can output error logs to the output during
configure. This can then be caught by CTest and flagged as an error
during the build.
2021-01-20 14:04:25 -05:00
Henry Schreiner 92854bf29e CUDA: Update arch selection, restructure for maintainability
Fixes: #21712
2021-01-20 12:28:28 -05:00
Henry Schreiner a58a572459 CUDA: Add arch selection debug mode to print out CUDA versions 2021-01-20 12:27:54 -05:00
Bianca van Schaik f2d92b983b GetPrerequisites: Include weak macOS dependencies
Starting with Clang 12, `otool -L` adds `, weak` to weakly linked
libraries.  Update GetPrerequisites to recognize these.

Issue: #21684
2021-01-20 10:26:54 -05:00
Craig Scott 315a200f0c FindGit: Cache the GIT_EXECUTABLE version for the current run
The git version should not change while CMake is running. When
using FetchContent with many dependencies, the repeated calls
to get the git version every time ExternalProject is used can be
measurable on some platforms. This commit queries that version
only once and then caches it in a global property for the rest of that
run. The git version can still safely change between runs because it
is not cached, only the GIT_EXECUTABLE location is cached.

Relates: #21703
2021-01-20 10:16:21 +11:00
Brad King 54dbc9c8f7 Merge topic 'ep-stash-options'
ac4a8002a5 ExternalProject: Don't git stash ignored files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5390
2021-01-18 11:20:45 -05:00
Brad King 28523d63ff Merge topic 'FindPostgreSQL-server-component'
8b066f1a65 FindPostgreSQL: Add server component

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5680
2021-01-18 11:16:04 -05:00
Brad King 069e5a932d Merge topic 'irsl-msvcp_atomic_wait_dll'
6718caaa2f IRSL: Install msvcp${v}${d}_atomic_wait.dll if available with CRT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5702
2021-01-18 11:14:22 -05:00
Craig Scott ac4a8002a5 ExternalProject: Don't git stash ignored files
The change to the binary gitrepo.tgz file adds a commit which
adds a .gitignore file.

Fixes: #21278
2021-01-16 18:12:00 +11:00
Kelly Walker 6718caaa2f IRSL: Install msvcp${v}${d}_atomic_wait.dll if available with CRT
VS now distributes these additional runtime libraries.  Install them
if available.

Fixes: #21675
2021-01-15 10:41:17 -05:00
Alexey Edelev 8b066f1a65 FindPostgreSQL: Add server component
Require the server-specific artifacts only if the Server
component is requested.

Issue: #17223
2021-01-15 10:33:55 -05:00
Brad King 205d30df12 Merge topic 'FindLAPACK-pkgconfig'
d21ad02d44 FindLAPACK: Add pkgconfig support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5696
2021-01-15 10:30:16 -05:00
Brad King b9b5d49284 Merge topic 'FindHDF5-no-dedup-keywords'
a5fe1712b2 FindHDF5: Remove unnecessary de-duplication of HDF5_LIBRARIES and friends
dadb13f546 FindHDF5: Simplify preprocessor setting de-duplication

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5692
2021-01-15 10:29:36 -05:00
Florent Pruvost d21ad02d44 FindLAPACK: Add pkgconfig support
- mimic FindBLAS

Fixes: #21700
2021-01-14 17:19:07 +01:00
Brad King 438ed46c13 Merge topic 'ExternalProject-configure-handled-by-build'
7155e358c9 ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5626
2021-01-13 09:21:47 -05:00
Brad King 82a3b6f89a Merge topic 'detect_corresponding_binutils_version'
b12aec6c8d BinUtils: prefer bin utils matching the compiler version extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5606
2021-01-13 09:19:30 -05:00
Kris Thielemans a5fe1712b2 FindHDF5: Remove unnecessary de-duplication of HDF5_LIBRARIES and friends
* When both debug and optimized libraries are found, the corresponding
  keywords were getting de-duplicated and breaking.
* CMake's link line generation de-duplicates in many cases anyway.
* Other find modules do not explicitly de-duplicate in general.

Fixes: #21670
2021-01-12 16:26:59 -05:00
Brad King dadb13f546 FindHDF5: Simplify preprocessor setting de-duplication
Use `list(REMOVE_DUPLICATES)` directly.  For definitions the order
doesn't matter.  For include directories it is better to remove late
duplicates than early duplicates.
2021-01-12 16:24:25 -05:00
Brad King 20a7d4485c Merge topic 'FindHDF5docfix'
eec3b775a7 FindHDF5: List imported targets in debug output
186b0f8131 FindHDF5: correct and describe list of imported target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5684
2021-01-12 10:31:52 -05:00
Brad King cc27ab0b27 Merge topic 'FindJPEG-turbo'
74cc2e3326 FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5683
2021-01-12 10:30:27 -05:00
Brad King d87a8934e0 Merge topic 'cuda-nvcc-ccache-symlink'
fb2afef620 CUDA: Support nvcc symlinking to ccache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Tested-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5620
2021-01-12 10:27:19 -05:00
Daan De Meyer 7155e358c9 ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD option
Fixes #21592.
2021-01-12 08:50:02 +01:00
Miguel Medalha 74cc2e3326 FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too 2021-01-11 12:07:02 -05:00
Kris Thielemans eec3b775a7 FindHDF5: List imported targets in debug output
If HDF5_FIND_DEBUG, list all targets that are defined
(from either FindHDF5.cmake or the hdf5-config.cmake).
2021-01-11 12:00:38 -05:00
Kris Thielemans 186b0f8131 FindHDF5: correct and describe list of imported target 2021-01-11 12:00:14 -05:00
Thomas Bernard b12aec6c8d BinUtils: prefer bin utils matching the compiler version extension 2021-01-11 11:33:37 -05:00
Brad King 0b32dfb292 Merge topic 'FindPostgreSQL-server-not-required'
f254e67bf6 FindPostgreSQL: Do not require pg_type.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5656
2021-01-11 11:27:04 -05:00
Rong Ou fb2afef620 CUDA: Support nvcc symlinking to ccache
Invoke `nvcc -v` to find the real CUDA bin directory.
This is needed if `nvcc` is a symlink to `ccache` or `colornvcc`.

Fixes: #21177
2021-01-11 00:18:04 -08:00
Brad King 05f4248e3d Merge topic 'cpp-modules'
39cbbb59a5 ninja: add experimental infrastructure to generate gcc-format modmap files
791b4d26d6 ninja: add experimental infrastructure to generate modmap files with dyndep
4b23359117 ninja: Add experimental infrastructure for C++20 module dependency scanning
f814d3b3c6 cmNinjaTargetGenerator: use $OBJ_FILE for the object
b0fc2993e1 Treat the '.mpp' file extension as C++ code
988f997100 cmScanDepFormat: Fix name of our internal tool in parse errors
dacd93a2db ninja: De-duplicate version numbers required for ninja features
533386ca29 cmStandardLevelResolver: Factor out helper to capture stoi exceptions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Shannon Booth <shannon.ml.booth@gmail.com>
Merge-request: !5562
2021-01-07 08:26:28 -05:00
Brad King 95e3ff2e88 Merge topic 'FindHDF5-dbg-and-rel' into release-3.19
5267ba9d63 FindHDF5: Fix finding both debug and release libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5653
2021-01-06 14:08:27 -05:00
Brad King 3734a96d98 Merge topic 'FindHDF5-dbg-and-rel'
5267ba9d63 FindHDF5: Fix finding both debug and release libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5653
2021-01-06 14:08:27 -05:00
Ben Boeckel b0fc2993e1 Treat the '.mpp' file extension as C++ code
This is the extension required in build2 for C++ module support.
2021-01-05 09:29:18 -05:00
Brad King 98084f902b Merge topic 'FindMPI-oneapi-single-quotes'
a5b223aa7f FindMPI: remove single quotes from include path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5654
2021-01-05 09:03:08 -05:00
Brad King 522015e04f Merge topic 'java-export-native_headers'
53235626a2 UseJava: enable exportation of native headers target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5658
2021-01-05 09:02:12 -05:00
Alexey Edelev f254e67bf6 FindPostgreSQL: Do not require pg_type.h
In systems where PostgreSQL has separate developer packages for
server and client libraries `PostgreSQL_TYPE_INCLUDE_DIR` is not
specified. According to initial logic server part was not required
but was accidentally added to `REQUIRED_VARS` during the migration to
`find_package_handle_standard_args`.

Fixes: #17223
2021-01-04 14:36:59 -05:00
Kris Thielemans 5267ba9d63 FindHDF5: Fix finding both debug and release libs
Use `target_link_libraries` to set `INTERFACE_LINK_LIBRARIES` so that
the `debug` and `optimized` keywords work.

In commit a8e0a6b3e4 (FindHDF5: Port changes from VTK, 2020-06-10,
v3.19.0-rc1~312^2~1) we added use of `HDF5_LIBRARIES`, but the value may
contain `debug` and `optimized` keywords.

Fixes: #21637
2021-01-04 14:26:38 -05:00