Commit Graph

52508 Commits

Author SHA1 Message Date
Brad King 2b2da04fbc Merge topic 'cray-version-patch'
258faaeef6 Cray: Detect Fortran compiler version patch level if available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5957
2021-03-31 09:32:57 -04:00
Justin LaPolla 258faaeef6 Cray: Detect Fortran compiler version patch level if available
Fixes: #21969
2021-03-31 09:30:48 -04:00
Brad King 45fae18f7b Merge topic 'cpackrpm-single-package-handling-empty-dir'
d0adb2386a CPackRPM: correctly handle empty dir in single package mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5951
2021-03-31 09:30:02 -04:00
Brad King cda40a42f1 Merge topic 'update-kwsys'
25ccb2c7c3 Merge branch 'upstream-KWSys' into update-kwsys
d0b9ffb630 KWSys 2021-03-30 (db93a594)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5960
2021-03-31 09:27:58 -04:00
Brad King 0d54fa0275 Merge branch 'release-3.20' 2021-03-31 09:26:36 -04:00
Brad King 375e14a405 Merge topic 'android-binutils' into release-3.20
61e6fc26bc Android: Fix search for binutils

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5958
2021-03-31 09:26:35 -04:00
Brad King f31d1dd175 Merge topic 'android-binutils'
61e6fc26bc Android: Fix search for binutils

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5958
2021-03-31 09:26:35 -04:00
Kitware Robot d796948f44 CMake Nightly Date Stamp 2021-03-31 00:01:19 -04:00
Brad King 25ccb2c7c3 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-03-30 (db93a594)
2021-03-30 10:45:01 -04:00
KWSys Upstream d0b9ffb630 KWSys 2021-03-30 (db93a594)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit db93a5948e331c8920ac701e35b2f7e283646cae (master).

Upstream Shortlog
-----------------

Lemures Lemniscati (2):
      9a6d6c54 Terminal: Avoid using Windows functions on Cygwin
      4c61b968 SystemTools::FileIsFullPath: Do not accept Windows paths on Cygwin
2021-03-30 10:45:01 -04:00
Haibo Huang 61e6fc26bc Android: Fix search for binutils
Set `CMAKE_SYSTEM_PROGRAM_PATH` in `Platform/Android-Initialize` instead
of `Platform/Android` so it can be used in `CMakeFindBinUtils`.

Also add the names `llvm-strip` and `llvm-ranlib` for the corresponding
tools.
2021-03-30 10:06:02 -04:00
Brad King d9b8acd238 Merge topic 'ifw-depends-name-version-parsing'
a43783a08d CPackIFW: Fix parsing of name and version in component DEPENDS
f536e6f3fb CPackIFW: Remove redundant variable assignment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5929
2021-03-30 09:56:31 -04:00
Brad King e6a5799fa0 Merge topic 'multiple-L-labels'
44ad3f0b7f ctest: Support multiple -L and -LE options to mean "AND"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Lars Bilke <larsbilke83@googlemail.com>
Merge-request: !5329
2021-03-30 09:55:42 -04:00
Brad King c0092247fe Merge topic 'ninja-automoc-cycle' into release-3.20
ca7c76269b Tests: Add test for Ninja automoc dependency cyle
54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jörg Bornemann <joerg.bornemann@qt.io>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5956
2021-03-30 09:54:09 -04:00
Brad King 8a25f817d9 Merge branch 'release-3.20' 2021-03-30 09:54:09 -04:00
Brad King f14e19c053 Merge topic 'ninja-automoc-cycle'
ca7c76269b Tests: Add test for Ninja automoc dependency cyle
54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jörg Bornemann <joerg.bornemann@qt.io>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5956
2021-03-30 09:54:09 -04:00
Brad King 16b4d5fc84 Merge topic 'GNUInstallDirs-doc' into release-3.20
06171fd7aa GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absolute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5947
2021-03-30 09:52:07 -04:00
Brad King 6081fdf415 Merge branch 'release-3.20' 2021-03-30 09:52:07 -04:00
Brad King 6859f55c77 Merge topic 'GNUInstallDirs-doc'
06171fd7aa GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absolute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5947
2021-03-30 09:52:07 -04:00
Brad King 9864338836 Merge branch 'release-3.20' 2021-03-30 09:50:49 -04:00
Brad King 1df75b171d Merge topic 'nmc-cc-no-output' into release-3.20
6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output
e21a80e97d Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5950
2021-03-30 09:50:48 -04:00
Brad King efcdec9a19 Merge topic 'nmc-cc-no-output'
6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output
e21a80e97d Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5950
2021-03-30 09:50:48 -04:00
Kitware Robot 2e77199030 CMake Nightly Date Stamp 2021-03-30 00:01:18 -04:00
Kyle Edwards ca7c76269b Tests: Add test for Ninja automoc dependency cyle 2021-03-29 15:17:11 -04:00
Kyle Edwards 54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile
SKIP_AUTOMOC files should not be included in moc processing, which
means they shouldn't be included in the depfile either. Remove them.

Fixes: #21977
2021-03-29 15:17:11 -04:00
Brad King 6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output
With generator expressions in a custom command's `OUTPUT` and
`BYPRODUCTS`, it is possible to have no outputs at all for a particular
configuration.  Generate no rule in this case.

Fixes: #21989
2021-03-29 09:56:43 -04:00
Brad King e21a80e97d Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output
Ninja versions prior to 1.6.0 occasionally print this message.
2021-03-29 09:55:57 -04:00
Brad King 06171fd7aa GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absolute
Fixes: #21991
2021-03-29 09:45:27 -04:00
Brad King 94f6ac5b50 Merge topic 'SWIG'
1d8e3a1e77 UseSWIG: Use standard library name conventions for csharp language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5949
2021-03-29 09:36:36 -04:00
Brad King a1997a184b Merge topic 'FindDoxygen-clarify-cmake-variable-naming'
739446a9a1 FindDoxygen: clarify the CMake variable naming scheme

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mateusz Mania <kajtkowo@gmail.com>
Merge-request: !5943
2021-03-29 09:35:42 -04:00
Brad King d212d91f14 Merge topic 'commands-file-permissions' into release-3.20
769ff05483 Help: Clarify permission-related command options
900184616a Cleanup: Fix misspelt name of local C++ variable
635431a0c9 Tests: Check host platform instead of target for running stat
4ceb0ca59e Tests: Remove redundant files for configure_file() tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5945
2021-03-29 09:32:09 -04:00
Brad King 06a335681a Merge branch 'release-3.20' 2021-03-29 09:32:09 -04:00
Brad King 75dd9b6c97 Merge topic 'commands-file-permissions'
769ff05483 Help: Clarify permission-related command options
900184616a Cleanup: Fix misspelt name of local C++ variable
635431a0c9 Tests: Check host platform instead of target for running stat
4ceb0ca59e Tests: Remove redundant files for configure_file() tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5945
2021-03-29 09:32:09 -04:00
Brad King 99dd2a6e15 Merge topic 'FindIntl-builtin' into release-3.20
e34d64c04d FindIntl: Fix detection of intl built in to C library
cb0d1a49e6 FindIntl: Improve documentation formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jeremy Tan <jtanx@outlook.com>
Acked-by: David Adam <zanchey@ucc.gu.uwa.edu.au>
Merge-request: !5948
2021-03-29 09:31:02 -04:00
Brad King b355358de3 Merge branch 'release-3.20' 2021-03-29 09:31:02 -04:00
Brad King c0ac5fd16c Merge topic 'FindIntl-builtin'
0850160254 Merge branch 'backport-FindIntl-builtin' into FindIntl-builtin
8e342a6637 FindIntl: Fix detection of intl built in to C library
f56c1571d2 Merge branch 'backport-FindIntl-builtin' into FindIntl-builtin
e34d64c04d FindIntl: Fix detection of intl built in to C library
cb0d1a49e6 FindIntl: Improve documentation formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jeremy Tan <jtanx@outlook.com>
Acked-by: David Adam <zanchey@ucc.gu.uwa.edu.au>
Merge-request: !5948
2021-03-29 09:31:02 -04:00
Brad King c9cf6370cf Merge branch 'release-3.20' 2021-03-29 09:29:40 -04:00
Brad King c4f8005454 Merge topic 'correct_arg_parsing'
79d7bcaf40 cmCommandLineArgument: correctly compute next parse index

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5936
2021-03-29 09:29:40 -04:00
Brad King 0e37e0d215 Merge topic 'correct_arg_parsing' into release-3.20
79d7bcaf40 cmCommandLineArgument: correctly compute next parse index

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5936
2021-03-29 09:29:39 -04:00
Kitware Robot d5ab6a53ed CMake Nightly Date Stamp 2021-03-29 00:01:18 -04:00
Domen Vrankar d0adb2386a CPackRPM: correctly handle empty dir in single package mode
Enabling CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE while
having an empty directory in non main component
resulted in packaging error that the directory
does not exist.

Fixes: #21951
2021-03-29 01:26:58 +02:00
Kitware Robot 699577e7b2 CMake Nightly Date Stamp 2021-03-28 00:01:11 -04:00
Adriaan de Groot 44ad3f0b7f ctest: Support multiple -L and -LE options to mean "AND"
Fixes: #21087
2021-03-28 12:04:05 +11:00
Kitware Robot b22c800604 CMake Nightly Date Stamp 2021-03-27 00:01:17 -04:00
Craig Scott 769ff05483 Help: Clarify permission-related command options
The previous docs did not make clear that at most only one of the three
permissions-related options can be given for configure_file() or
file(GENERATE) and that USE_SOURCE_PERMISSIONS is already the
default behavior for these commands.

Use consistent wording to refer to the input and output files for
configure_file().

Add missing "versionadded" directives on some of these keywords.

Use the consistent wording and keyword ordering between the
configure_file(), file(GENERATE) and file(COPY) commands.
2021-03-27 09:54:27 +11:00
Craig Scott a43783a08d CPackIFW: Fix parsing of name and version in component DEPENDS
The DEPENDS or DEPENDENCIES arguments in a call to
cpack_ifw_configure_component() or cpack_ifw_configure_component_group()
specify a name and optionally a version constraint as a single string.
QtIFW also allows a colon (requires QtIFW 3.1 or later) or a hyphen to
separate the name and version. The version may optionally contain a
leading operator, with = being assumed when no operator is present.

The previous code was not handling : as a separator at all and was
erroneously dropping the version part when no operator was given.
Fix both of those non-conforming behaviors and also warn if trying
to use a hyphen in a name with a QtIFW version that isn't recent enough
to support it.

Fixes: #21697
2021-03-27 07:44:00 +11:00
Marc Chevrier 1d8e3a1e77 UseSWIG: Use standard library name conventions for csharp language
Fixes: #21542
2021-03-26 16:27:18 +01:00
Brad King 0850160254 Merge branch 'backport-FindIntl-builtin' into FindIntl-builtin 2021-03-26 11:17:28 -04:00
Brad King 8e342a6637 FindIntl: Fix detection of intl built in to C library
Since commit c30d06b7e6 (FindIntl: Add imported target, 2020-10-06,
v3.20.0-rc1~687^2) we use `check_symbol_exists` to check whether the
`intl` library is built in to the C library.  On some platforms the
tested symbols are provided as macros so the check passes without
linking any symbol.  Instead, check whether a sample source file both
compiles and links.

Fixes: #21979
2021-03-26 11:16:03 -04:00
Brad King f56c1571d2 Merge branch 'backport-FindIntl-builtin' into FindIntl-builtin 2021-03-26 11:12:53 -04:00