Commit Graph

12378 Commits

Author SHA1 Message Date
Chris Wright
87142bbd5f ADSP: Add dedicated platform module 2022-04-04 17:05:09 +01:00
Chris Wright
e9eabb0dcd ADSP: Configure compiler in compiler module 2022-04-04 16:56:47 +01:00
Chris Wright
88b38f531a ADSP: Support both VDSP++ and CCES for ADSP compilers 2022-04-04 16:56:47 +01:00
Brad King
63d5c8a3a8 Merge topic 'quiet_pkg-config'
99f7d1973c FindGSL: Quiet pkg-config errors
655582e931 FindLAPACK: Quiet pkg-config errors
6dab35e25d FindBLAS: Quiet pkg-config errors
b2a7f73b55 FindGLUT: Quiet pkg-config errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7128
2022-03-31 08:53:01 -04:00
Brad King
ad3c50e0b4 Merge topic 'GNUInstallDirs-revert-multiarch-prefixes'
624ec3692f GNUInstallDirs: Revert "Apply Debian multiarch LIBDIR to more prefixes"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7127
2022-03-31 08:50:25 -04:00
Brad King
2657454b59 Merge topic 'CMakeDependentOption-doc-improvement'
7a614977f9 CMakeDependentOption: improve documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rui Oliveira <ruimail24@gmail.com>
Merge-request: !7124
2022-03-31 08:46:29 -04:00
Ben Boeckel
7a614977f9 CMakeDependentOption: improve documentation
This makes it far clearer that `<depends>` is a list up front instead of
burying the lede because a list is generally "trivially true" in CMake[1].
Also clarify that `<force>` is only available as a local variable and if
queried outside of the "scope" of the `cmake_dependent_option` call,
will get the stored user cache value.

[1] The exception being when the last entry ends in `-NOTFOUND`.

Suggested-by: Rui Oliveira
2022-03-30 16:05:37 -04:00
nega
99f7d1973c FindGSL: Quiet pkg-config errors
Issue: #23314
2022-03-30 16:01:59 -04:00
nega
655582e931 FindLAPACK: Quiet pkg-config errors
Issue: #23314
2022-03-30 16:01:56 -04:00
nega
6dab35e25d FindBLAS: Quiet pkg-config errors
Issue: #23314
2022-03-30 16:01:49 -04:00
nega
b2a7f73b55 FindGLUT: Quiet pkg-config errors
Issue: #23314
2022-03-30 15:59:31 -04:00
Brad King
624ec3692f GNUInstallDirs: Revert "Apply Debian multiarch LIBDIR to more prefixes"
Revert commit dd9584b352 (GNUInstallDirs: Apply Debian multiarch LIBDIR
to more prefixes, 2021-11-19, v3.23.0-rc1~323^2).  There are separate
problems with activating multiarch `LIBDIR` for each prefix it added:

* Prefix `/` is often used to stage an installation with `DESTDIR`
  for inclusion in a tarball package or similar.

* Prefix `/usr/local` is the default `CMAKE_INSTALL_PREFIX`, causing
  the multiarch `LIBDIR` to be cached after the first configuration,
  even if the prefix changes later.

Revert the change for now, except for the documentation update.
Further discussion will be needed to select a way to enable
multiarch `LIBDIR` for `/` and `/usr/local`.

Fixes: #23365
Issue: #19698
2022-03-30 11:51:01 -04:00
Brad King
1e23384580 Merge topic 'FindHDF5-library'
e4e309f165 FindHDF5: Add explicit library location instead of guessed library name.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7105
2022-03-30 09:04:26 -04:00
Klein, Thorsten (BSH)
211a9deac1 Preserve CMAKE_${lang}_COMPILER_ARG1 from existing CMakeCache.txt
`CMAKE_<LANG>_COMPILER` may be a list if it was defined by a toolchain
file.  In this case we move the args to `CMAKE_<LANG>_COMPILER_ARG1`.
If `CMAKE_<LANG>_COMPILER` is not a list, then it might have been cached
by a previous run that split the `CC` or `CXX` environment variable into
`CMAKE_<LANG>_COMPILER` and `CMAKE_<LANG>_COMPILER_ARG1`.  In this
latter case, avoid clobbering `CMAKE_<LANG>_COMPILER_ARG1`.

Fixes: #23358
2022-03-29 10:36:28 -04:00
Brad King
d183d06a40 Merge topic 'cpack-ifw-4.3'
343ed1f913 CPack/IFW: Add support for QtIFW 4.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7114
2022-03-28 10:51:42 -04:00
Brad King
2dffc7c8fd Merge topic 'cpack-ifw-4.3' into release-3.23
343ed1f913 CPack/IFW: Add support for QtIFW 4.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7114
2022-03-28 10:51:41 -04:00
Brad King
d71f696486 Merge topic 'GetPrerequisties-win-findstr'
ef2fa9b03b GetPrerequisties: pass "-a" only to grep.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7110
2022-03-25 09:45:35 -04:00
Mehdi Chinoune
ef2fa9b03b GetPrerequisties: pass "-a" only to grep. 2022-03-25 09:07:44 -04:00
Craig Scott
343ed1f913 CPack/IFW: Add support for QtIFW 4.3 2022-03-25 22:05:24 +11:00
Brad King
c4d16c4964 Merge topic 'LINK_GROUP-feat-RESCAN-on-BSD-systems'
d658332782 Genex-LINK_GROUP: Add support feature RESCAN on BSD systems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7104
2022-03-23 09:30:29 -04:00
مهدي شينون (Mehdi Chinoune)
e4e309f165 FindHDF5: Add explicit library location instead of guessed library name. 2022-03-22 17:09:28 +01:00
Brad King
621120e87c Merge topic 'FindMatlab-batch'
8468dfb35f FindMatlab: Use -batch option in matlab_add_unit_test if possible
ebb0685824 FindMatlab: Add fallback to use -batch option in version extraction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7088
2022-03-22 09:00:16 -04:00
Brad King
c494803778 Merge topic 'cuda-nvcc-error-msg-on-detection-failure'
4040173ed3 CUDA: Generate better error message when detecting nvcc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7094
2022-03-22 08:59:26 -04:00
Brad King
a20424e737 Merge topic 'productbuild-rootVolumeOnly'
2a8df7e7db productbuild: Don't write rootVolumeOnly attribute if writing domains
95eb8cbcfc CPack: Avoid space / tab mix in productbuild distribution.xml template
28fdc3a536 productbuild: Simplify internal CPACK_PRODUCTBUILD_DOMAINS usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7092
2022-03-22 08:51:02 -04:00
Brad King
73939fb3cb Merge topic 'productbuild-rootVolumeOnly' into release-3.23
2a8df7e7db productbuild: Don't write rootVolumeOnly attribute if writing domains
95eb8cbcfc CPack: Avoid space / tab mix in productbuild distribution.xml template
28fdc3a536 productbuild: Simplify internal CPACK_PRODUCTBUILD_DOMAINS usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7092
2022-03-22 08:51:01 -04:00
Brad King
c295f4a77e Merge topic 'cpack-nsis-fix-uninstall-quoting'
5d2ceaada8 CPack/NSIS: Add support for unquoted (legacy) uninstaller strings
b795c96727 CPack/NSIS: Fix uninstall command when run from installer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7096
2022-03-22 08:45:04 -04:00
Brad King
21fa99320f Merge topic 'cpack-nsis-fix-uninstall-quoting' into release-3.23
5d2ceaada8 CPack/NSIS: Add support for unquoted (legacy) uninstaller strings
b795c96727 CPack/NSIS: Fix uninstall command when run from installer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7096
2022-03-22 08:45:03 -04:00
Brad King
fd467241a4 Merge topic 'FindCUDAToolkit-cufftw-static'
3e7113e644 FindCUDAToolkit: Add missing cufftw_static target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7093
2022-03-22 08:43:29 -04:00
Marc Chevrier
d658332782 Genex-LINK_GROUP: Add support feature RESCAN on BSD systems 2022-03-22 11:36:10 +01:00
Robert Maynard
4040173ed3 CUDA: Generate better error message when detecting nvcc
Issue: #23322, #23323
2022-03-21 15:18:22 -04:00
Silvio Traversaro
8468dfb35f FindMatlab: Use -batch option in matlab_add_unit_test if possible 2022-03-21 14:58:24 -04:00
Marc Jeanmougin
5d2ceaada8 CPack/NSIS: Add support for unquoted (legacy) uninstaller strings 2022-03-21 14:53:44 -04:00
Marc Jeanmougin
b795c96727 CPack/NSIS: Fix uninstall command when run from installer
The quoting introduced by commit eb3b3bacdc (CPack/NSIS: Fix uninstall
on Windows using "Apps & Features", 2021-09-13, v3.22.0-rc1~136^2)
created two errors in the uninstaller call: double quoting of the
uninstaller executable, and quotes added to the `_?=` argument which
does not support them.  Simplify the command.
2022-03-21 14:53:31 -04:00
Brad King
7e642a6fa0 Merge topic 'ghs_predefined_targets'
399e73b89a GHS: release note
829e946c69 GHS: Update tests for updated binary layout
93c1acd8ff GHS: List predefined targets before user targets in GUI
bdb213819c GHS: Do not include WindowsPaths
b3e9c72901 GHS: use INSTALL target
a645287784 GHS: update build command
724b5491ef GHS: Rearrange project files in binary directory
edff0f6a1d GHS: Use Custom Target for ALL_BUILD
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7079
2022-03-21 14:36:42 -04:00
Brad King
a4b04e62fc Merge topic 'LINK_LIBRARY-WHOLE_ARCHIVE'
dabe56de58 genex-LINK_LIBRARY: Add feature WHOLE_ARCHIVE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: huangqinjin <huangqinjin@gmail.com>
Merge-request: !7064
2022-03-21 14:35:59 -04:00
Robert Maynard
3e7113e644 FindCUDAToolkit: Add missing cufftw_static target
Fixes #23347
2022-03-21 09:40:17 -04:00
Craig Scott
2a8df7e7db productbuild: Don't write rootVolumeOnly attribute if writing domains
The rootVolumeOnly attribute is deprecated. Apple docs say to use
domains instead.

Fixes: #23343
2022-03-21 15:43:46 +11:00
Craig Scott
95eb8cbcfc CPack: Avoid space / tab mix in productbuild distribution.xml template 2022-03-21 14:31:09 +11:00
Silvio
ebb0685824 FindMatlab: Add fallback to use -batch option in version extraction
Fixes: #22646
2022-03-18 15:36:04 +01:00
Brad King
367aed1433 Merge topic 'r2022a'
6032213456 FindMatlab: Add R2022a => 9.12 version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7086
2022-03-18 08:20:59 -04:00
Michael Hirsch
6032213456 FindMatlab: Add R2022a => 9.12 version 2022-03-18 07:22:42 -04:00
Brad King
91228fe512 Merge topic 'FindPython-pypy-specify-versions'
2834cea155 FindPython: fix various problems using pypy interpreters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7081
2022-03-18 07:18:05 -04:00
Brad King
528a426c8e Merge topic 'FindPython-pypy-specify-versions' into release-3.23
2834cea155 FindPython: fix various problems using pypy interpreters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7081
2022-03-18 07:18:04 -04:00
Fred Baksik
bdb213819c GHS: Do not include WindowsPaths
This causes issues where CMAKE_SYSTEM_PREFIX_PATH contains incorrect
paths. GHS is a cross-compiler toolchain and doesn't use anything in
these locations.

Also WindowsPaths are always wrong on Linux hosts.
2022-03-17 19:11:46 -04:00
Marc Chevrier
dabe56de58 genex-LINK_LIBRARY: Add feature WHOLE_ARCHIVE 2022-03-17 23:07:59 +01:00
Brad King
8fb43af04a Merge topic 'FindPostgreSQL-doc-versions'
fcc0119af0 FindPostgreSQL: Update known versions in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7080
2022-03-17 11:04:00 -04:00
Marc Chevrier
2834cea155 FindPython: fix various problems using pypy interpreters
* add more possible directories for include file search
* enhance version detection from library and include files
* search for file pypy_decl.h when PyPy.h is not defined
2022-03-17 14:53:40 +01:00
Kai Pastor
fcc0119af0 FindPostgreSQL: Update known versions in documentation 2022-03-17 09:41:57 -04:00
Brad King
7f36e0ff6e Merge topic 'cuda-arch-native'
ff8c0e9c10 ci: Clamp CUDA 'native' architecture to values supported by its toolkit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7074
2022-03-17 09:12:07 -04:00
Brad King
ff8c0e9c10 ci: Clamp CUDA 'native' architecture to values supported by its toolkit
The `native` architecture compiles for the host's GPUs, but our CI jobs
may may run on hosts with GPUs newer than supported by their version of
the CUDA toolkit.  Add an undocumented environment variable to tell
CMake to clamp the native architecture to that supported by the toolkit.

Without this, we may try to compile for architectures not supported by
the CUDA Toolkit, which fails.  Since commit d1b48bfabd (CUDA: Add
support for CUDA_ARCHITECTURES=native, 2022-03-04), our CUDA 9.2 CI job
fails when it runs on a CI host with a GPU architecture newer than that
CUDA 9.2 supports.  Clamping the architecture level fixes that.

Do not document this clamp behavior publicly, at least for now.
Users can be responsible for building with a CUDA toolkit recent
enough to support their host's GPUs.

Issue: #22375
2022-03-16 13:14:51 -04:00