Commit Graph

52032 Commits

Author SHA1 Message Date
Sibi Siddharthan 01e9922db5 FindIconv: Add version support
Issue: #21857
2021-02-25 20:18:55 +05:30
Brad King ec5f76753a Merge topic 'cpack_nsis_executable_custom'
8e8b99d01a CPack/NSIS: Add option for setting custom makensis executable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5839
2021-02-23 08:11:05 -05:00
Brad King 581402f00c Merge branch 'release-3.20' 2021-02-23 08:09:59 -05:00
Brad King 97f7a08ff9 Merge topic 'test-ExternalProject-CONFIGURE_HANDLED_BY_BUILD'
74fe16a292 Tests: Fix ExternalProject CONFIGURE_HANDLED_BY_BUILD on 1s filesystems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5838
2021-02-23 08:09:59 -05:00
Brad King c2c31ae896 Merge topic 'test-ExternalProject-CONFIGURE_HANDLED_BY_BUILD' into release-3.20
74fe16a292 Tests: Fix ExternalProject CONFIGURE_HANDLED_BY_BUILD on 1s filesystems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5838
2021-02-23 08:09:59 -05:00
Brad King a4257333ac Merge branch 'release-3.20' 2021-02-23 08:09:10 -05:00
Brad King 65b70406d9 Merge topic 'test-macos-arm64' into release-3.20
1c15eb39d2 Tests: Suppress failures on macOS arm64 due to separate Xcode signing phase
92418ac0ef Tests: Fix CTestTestCrash expected output on macOS arm64
8b22d9b3c3 Tests: Remove explicit no-signing marks from BundleTest
483db3de56 Tests: Clarify internal project name in RunCMake.GoogleTest cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5846
2021-02-23 08:09:10 -05:00
Brad King b9b72384e0 Merge topic 'test-macos-arm64'
1c15eb39d2 Tests: Suppress failures on macOS arm64 due to separate Xcode signing phase
92418ac0ef Tests: Fix CTestTestCrash expected output on macOS arm64
8b22d9b3c3 Tests: Remove explicit no-signing marks from BundleTest
483db3de56 Tests: Clarify internal project name in RunCMake.GoogleTest cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5846
2021-02-23 08:09:10 -05:00
Brad King 8362915b9d Merge topic 'cmake-gui-restore-search' into release-3.20
134d69121e cmake-gui: Restore search bar for cache view and environment dialog

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5845
2021-02-23 08:07:31 -05:00
Brad King fedb93982e Merge branch 'release-3.20' 2021-02-23 08:07:31 -05:00
Brad King 833299356b Merge topic 'cmake-gui-restore-search'
134d69121e cmake-gui: Restore search bar for cache view and environment dialog

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5845
2021-02-23 08:07:31 -05:00
Brad King 7714c582d4 Merge branch 'release-3.20' 2021-02-23 08:06:31 -05:00
Brad King e1ea0c9540 Merge topic 'nag-fortran-include-moddir' into release-3.20
ec030877a2 NAG: Fix using Fortran modules from their output directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5842
2021-02-23 08:06:30 -05:00
Brad King 788f231e4c Merge topic 'nag-fortran-include-moddir'
ec030877a2 NAG: Fix using Fortran modules from their output directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5842
2021-02-23 08:06:30 -05:00
Brad King 049c257e1d Merge topic 'per-config-autogen-info-file' into release-3.20
a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5840
2021-02-23 08:00:12 -05:00
Brad King 7120e2e8ad Merge branch 'release-3.20' 2021-02-23 08:00:12 -05:00
Brad King 4052aa41c5 Merge topic 'per-config-autogen-info-file'
a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5840
2021-02-23 08:00:12 -05:00
Kitware Robot bdf6a71c56 CMake Nightly Date Stamp 2021-02-23 00:01:18 -05:00
Brad King 1c15eb39d2 Tests: Suppress failures on macOS arm64 due to separate Xcode signing phase
Some tests fail because Xcode runs `POST_BUILD` commands before signing
the binaries they run.  Tell the linker to perform ad-hoc codesign even
though Xcode normally tells it not to.

Other tests fail because `install_name_tool` does not revise ad-hoc
signatures without the codesign `linker-signed` flag.  Add that flag
ourselves where needed by our tests.

For now these changes help our test suite pass so we can use it to cover
everything else.  Both of these cases may need further investigation to
update CMake to help projects in general.

Issue: #21845, #21854
2021-02-22 15:47:13 -08:00
Sankhesh Jhaveri 134d69121e cmake-gui: Restore search bar for cache view and environment dialog
This was broken by commit f1de6f6682 (cmake-gui: Support building
against Qt6, 2020-12-17, v3.20.0-rc1~205^2~7).

Fixes: #21850
2021-02-22 17:56:59 -05:00
Brad King 92418ac0ef Tests: Fix CTestTestCrash expected output on macOS arm64 2021-02-22 17:24:14 -05:00
Brad King 8b22d9b3c3 Tests: Remove explicit no-signing marks from BundleTest
These were added by commit e29a92f525 (Xcode: Make BundleTests
compatible with Xcode 11, 2019-09-01, v3.16.0-rc1~158^2).  The
real problem is that the `.app` is constructed with text files
under the `.app/Contents/MacOS/` folder.  Move those, and drop
the special no-signing configuration.
2021-02-22 13:58:24 -05:00
Brad King 483db3de56 Tests: Clarify internal project name in RunCMake.GoogleTest cases 2021-02-22 13:30:19 -05:00
Johnny Jazeix 8e8b99d01a CPack/NSIS: Add option for setting custom makensis executable
It allows users to set a custom one without changing the PATH environment variable.

Fixes: #21733
2021-02-22 17:59:04 +01:00
Daan De Meyer 74fe16a292 Tests: Fix ExternalProject CONFIGURE_HANDLED_BY_BUILD on 1s filesystems
Following commit 7155e358c9 (ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD
option, 2020-12-16, v3.20.0-rc1~168^2), modify the CONFIGURE_HANDLED_BY_BUILD
test to sleep 1.125 seconds to make sure the file timestamp is always
updated regardless of the resolution of the underlying filesystem.

Fixes: #21830
2021-02-22 11:17:20 -05:00
Brad King 5a1c2bd7d8 Merge branch 'release-3.20' 2021-02-22 11:05:46 -05:00
Brad King e9efa04d8d Merge topic 'fix-IS_NEWER_THAN-usage' into release-3.20
b0da671243 FetchContent: Don't update timestamps if files don't change
404cddb7bb ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5825
2021-02-22 11:05:45 -05:00
Brad King b605dbde89 Merge topic 'fix-IS_NEWER_THAN-usage'
300a471245 Merge branch 'backport-FetchContent-timestamps' into fix-IS_NEWER_THAN-usage
8c93e3232f GoogleTest: Fix misuse of IS_NEWER_THAN in timestamp check
28501fca94 PCH PDB: Fix misuse of IS_NEWER_THAN in timestamp check
d7c8030541 FortranCInterface: Fix misuse of IS_NEWER_THAN in timestamp check
b0da671243 FetchContent: Don't update timestamps if files don't change
404cddb7bb ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5825
2021-02-22 11:05:45 -05:00
Brad King 300a471245 Merge branch 'backport-FetchContent-timestamps' into fix-IS_NEWER_THAN-usage 2021-02-22 11:02:43 -05:00
Craig Scott 8c93e3232f GoogleTest: Fix misuse of IS_NEWER_THAN in timestamp check
When using a file system which only has second resolution timestamps,
there is a reasonably high likelihood of timestamps being the same.
The IS_NEWER_THAN test returns true when timestamps are the same,
so don't redo test discovery when they match exactly.
2021-02-22 11:02:38 -05:00
Craig Scott 28501fca94 PCH PDB: Fix misuse of IS_NEWER_THAN in timestamp check
When using a file system which only has second resolution timestamps,
there is a reasonably high likelihood of timestamps being the same.
The IS_NEWER_THAN test returns true when timestamps are the same,
so don't retry copying the PCH PDB file when they match exactly.
2021-02-22 11:02:38 -05:00
Craig Scott d7c8030541 FortranCInterface: Fix misuse of IS_NEWER_THAN in timestamp check
When using a file system which only has second resolution timestamps,
there is a reasonably high likelihood of timestamps being the same.
The IS_NEWER_THAN test returns true when timestamps are the same,
so don't redo detection when they match exactly.
2021-02-22 11:02:37 -05:00
Craig Scott b0da671243 FetchContent: Don't update timestamps if files don't change
The refactoring in 17e5516e60 (FetchContent: Invoke steps directly and
avoid a separate sub-build, 2021-01-29) uses a different way of writing
out the step scripts and updating time stamps when steps are executed.
That inadvertently always wrote out the scripts for custom commands,
even when the contents didn't change. This caused their timestamp to
always be updated, resulting in those steps always being seen as
out-of-date and needing to be re-executed.

The way timestamps were checked to determine whether to re-execute
a step also did not adequately account for file systems which only have
second-resolution timestamps. The IS_NEWER_THAN if condition also
returns true when timestamps are the same, so one needs to use the
negative form to get a true "is newer than" test.

ExternalProject is not susceptible to this problem because it uses
file(GENERATE) to write out the script files and that only updates the file's
timestamp if the contents change. It also mostly leaves timestamp
checking to the build tool.
2021-02-22 11:02:20 -05:00
Craig Scott 404cddb7bb ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks
When using a file system which only has second resolution timestamps,
there is a reasonably high likelihood of timestamps being the same.
The IS_NEWER_THAN test returns true when timestamps are the same,
so don't redo downloads when they match exactly.
2021-02-22 11:02:20 -05:00
Brad King e360dcdec1 Merge branch 'release-3.20' 2021-02-22 10:40:29 -05:00
Brad King c6feaa502e Merge topic 'vs-pch-one-lang'
9945b3b565 VS: Restore support for PCH in CXX but not C within once target
d9fd32b3b3 cmVisualStudio10TargetGenerator: Refactor per-source PCH logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5836
2021-02-22 10:40:29 -05:00
Brad King 33d93089ef Merge topic 'vs-pch-one-lang' into release-3.20
9945b3b565 VS: Restore support for PCH in CXX but not C within once target
d9fd32b3b3 cmVisualStudio10TargetGenerator: Refactor per-source PCH logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5836
2021-02-22 10:40:28 -05:00
Brad King c8c51c9534 Merge branch 'release-3.20' 2021-02-22 10:39:30 -05:00
Brad King 48797098fe Merge topic 'cpackifw-scanbuild-fix' into release-3.20
90c2f138ee CPackIFWInstaller: Avoid potential null pointer dereference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5832
2021-02-22 10:39:30 -05:00
Brad King db4a4b9e7a Merge topic 'cpackifw-scanbuild-fix'
90c2f138ee CPackIFWInstaller: Avoid potential null pointer dereference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5832
2021-02-22 10:39:30 -05:00
Brad King b473a9ce1a Merge branch 'release-3.20' 2021-02-22 10:38:01 -05:00
Brad King b2b73ff713 Merge topic 'doc-cpack-dpkg-shlibdeps-l' into release-3.20
cf9a71870b Help: Fix CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5835
2021-02-22 10:38:00 -05:00
Brad King 1fa9dc3578 Merge topic 'doc-cpack-dpkg-shlibdeps-l'
cf9a71870b Help: Fix CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5835
2021-02-22 10:38:00 -05:00
Brad King ec030877a2 NAG: Fix using Fortran modules from their output directory
The NAG Fortran compiler's `-mdir` flag sets the module output
directory but does not add the directory to the search path for using
modules.  This is inconsistent with other compilers like the GNU Fortran
compiler's `-J` flag that does both.  In order to make these consistent,
add the module output directory with a `-I` flag on the NAG Fortran
compiler so that it will be searched when using modules too.

We already do this for the XL Fortran compiler since commit 210b0b99a9
(XL: Fix using Fortran modules from their output directory, 2020-02-28,
v3.18.0-rc1~640^2~1).
2021-02-22 09:38:12 -05:00
Craig Scott a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json
Qt6 reads our internal AutogenInfo.json file. In 92d7b456e5
(Autogen: Add support for per-config sources, 2020-10-20), the
ordering of the HEADERS array elements was changed and this
broke their cmake_automoc_parser. We don't need to change the
order of the array elements, we can append to the existing ones
instead. Do this to allow their cmake_automoc_parser to continue
to work.

Fixes: #21823
2021-02-22 16:11:26 +11:00
Kitware Robot 9e1fe1f358 CMake Nightly Date Stamp 2021-02-22 00:02:13 -05:00
Kitware Robot 7aad4df2ff CMake Nightly Date Stamp 2021-02-21 00:01:08 -05:00
Kitware Robot 894e5548a8 CMake Nightly Date Stamp 2021-02-20 00:01:14 -05:00
Brad King 9945b3b565 VS: Restore support for PCH in CXX but not C within once target
Fix logic from commit 9df1f33c9a (VisualStudio: move PCH rules to
projects when possible., 2020-10-15, v3.20.0-rc1~638^2) to explicitly
disable PCH on sources that should not use the target-wide PCH rules.

Fixes: #21827
2021-02-19 11:25:29 -05:00
Brad King d9fd32b3b3 cmVisualStudio10TargetGenerator: Refactor per-source PCH logic
De-duplicate the link language lookup.
2021-02-19 11:25:03 -05:00