summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'add_test-special-chars-in-name'Brad King2020-08-17107-13/+437
|\ | | | | | | | | | | | | a20987732b add_test: Allow special characters in test name (w/ policy CMP0110) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5076
| * add_test: Allow special characters in test name (w/ policy CMP0110)Deniz Bahadir2020-08-12107-13/+437
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the change from commit f84af8e270 (add_test: Allow special characters in test name, 2020-05-16, v3.18.0-rc1~142^2) that had to be reverted by commit f84af8e270 (add_test: Allow special characters in test name, 2020-05-16, v3.18.0-rc1~142^2) for compatibility. Add policy CMP0110 to make the change in a compatible way. Also, support even more characters than before by generating the test scripts using bracket arguments around the test names. Fixes: #19391 Signed-off-by: Deniz Bahadir <dbahadir@benocs.com>
* | Merge topic 'FindX11-xcb-util-xfixes'Brad King2020-08-173-0/+80
|\ \ | | | | | | | | | | | | | | | | | | 6d231b494f FindX11: Add xcb_util and xcb_xfixes libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5116
| * | FindX11: Add xcb_util and xcb_xfixes librariesTim Blechmann2020-08-123-0/+80
| | |
* | | Merge topic 'xcode12-link-matching-zlib'Brad King2020-08-171-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 862dbe1367 Xcode: Link matching zlib for iOS Simulator SDK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5125
| * | | Xcode: Link matching zlib for iOS Simulator SDKGregor Jasny2020-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XcodeRemoveExcessiveISystem test runs `find_package(ZLIB)` which returns an SDK-relative path to `zlib.tlb`. When the test switches the SDK for building to something different than the SDK used for configuration the linker rightfully complains about the mismatch. The fix is to configure and build with the same SDK.
* | | | Merge topic 'ios-combined-prune-archs'Brad King2020-08-174-3/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5852b8867f CMakeIOSInstallCombined: Enforce disjoint architecture sets 79098d23eb Tests: Avoid warnings about unused arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5111
| * | | | CMakeIOSInstallCombined: Enforce disjoint architecture setsGregor Jasny2020-08-082-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Xcode 12 the arm64 architecture is supported as an iOS device as well as simulator architecture. But the fat macho file format does not distinguish by SDK, only by architecture. That makes lipo (rightfully) complain that it cannot add both architectures to a single file. To work around we make sure that both SDKs are built for a disjoint set of architectures. If an architecture is present for both SDKs we prefer the currently configured one. The log output has been extended to reflect that: ``` [iOS combined] Architectures (iphoneos): arm64 arm64e armv7 armv7s [iOS combined] Architectures (iphonesimulator): arm64 arm64e i386 x86_64 [iOS combined] Architectures (iphonesimulator) after pruning: i386 x86_64 ```
| * | | | Tests: Avoid warnings about unused argumentsGregor Jasny2020-08-082-2/+2
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-08-171-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-08-161-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-08-151-1/+1
| | | | |
* | | | | Merge topic 'FindOpenSSL-static'Kyle Edwards2020-08-141-0/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1925f9d8eb FindOpenSSL: Add support for finding static libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5124
| * | | | | FindOpenSSL: Add support for finding static librariesSylvain Corlay2020-08-131-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20903
* | | | | | Merge topic 'help-formatting'Craig Scott2020-08-141-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b17421bdc Help: Improve formatting for IMPLICIT_DEPENDS_INCLUDE_TRANSFORM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5126
| * | | | | | Help: Improve formatting for IMPLICIT_DEPENDS_INCLUDE_TRANSFORMJosef Angstenberger2020-08-131-5/+5
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-08-141-1/+1
|/ / / / / /
* | | | | | Merge topic 'optimize-static-library-deps'Kyle Edwards2020-08-1347-8/+559
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e42651dff Add option to optimize link dependencies for static libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5103
| * | | | | Add option to optimize link dependencies for static librariesKyle Edwards2020-08-1247-8/+559
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an `OPTIMIZE_DEPENDENCIES` target property and supporting `CMAKE_OPTIMIZE_DEPENDENCIES` variable to optionally enable pruning and flattening of outgoing dependencies from static libraries. Since they do not actually link, they only depend on side effects of their dependencies. Therefore we can drop dependencies that contribute no side effects.
* | | | | CMake Nightly Date StampKitware Robot2020-08-131-1/+1
| | | | |
* | | | | Merge branch 'release-3.18'Brad King2020-08-120-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'FindRuby_document_deprecated_variables' into release-3.18Brad King2020-08-121-2/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7fe0b24c4 FindRuby: Add documentation for deprecated variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5120
* | \ \ \ \ \ Merge topic 'FindRuby_document_deprecated_variables'Brad King2020-08-121-2/+13
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7fe0b24c4 FindRuby: Add documentation for deprecated variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5120
| * | | | | | FindRuby: Add documentation for deprecated variablesDaniele E. Domenichelli2020-08-121-2/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11, v3.18.0-rc1~546^2), the upper-case-prefixed variable names are for compatibility only but still exist. Put them back in the documentation. Issue: #21064
* | | | | | Merge branch 'release-3.18'Brad King2020-08-120-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge topic 'msvc_c11' into release-3.18Brad King2020-08-123-12/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7347f28c7 MSVC: Record support for C11 and c_restrict Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5115
* | \ \ \ \ \ Merge topic 'msvc_c11'Brad King2020-08-123-12/+40
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7347f28c7 MSVC: Record support for C11 and c_restrict Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5115
| * | | | | | MSVC: Record support for C11 and c_restrictRaul Tambre2020-08-113-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC >=19.27 supports a C11 switch. The `c_restrict` feature has also been implemented. Fixes: #21069
* | | | | | | Merge branch 'release-3.18'Brad King2020-08-120-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'FindPython-manage-SOABI-in-all-versions' into release-3.18Brad King2020-08-122-12/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 951640f1f9 FindPython: manage SOABI for all Python versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5119
* | \ \ \ \ \ \ Merge topic 'FindPython-manage-SOABI-in-all-versions'Brad King2020-08-122-12/+20
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 951640f1f9 FindPython: manage SOABI for all Python versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5119
| * | | | | | | FindPython: manage SOABI for all Python versionsMarc Chevrier2020-08-112-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21070
* | | | | | | | CMake Nightly Date StampKitware Robot2020-08-121-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.18'Brad King2020-08-110-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'gitlab-ci-tag-cmake' into release-3.18Brad King2020-08-111-0/+3
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 778ea72b59 gitlab-ci: add 'cmake' tag to all jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5121
* | | | | | | | Merge topic 'gitlab-ci-tag-cmake'Brad King2020-08-111-0/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | 778ea72b59 gitlab-ci: add 'cmake' tag to all jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5121
| * | | | | | gitlab-ci: add 'cmake' tag to all jobsBrad King2020-08-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will give us more granular control over which runners accept jobs for CMake.
* | | | | | | Merge topic 'findlapack-quiet'Brad King2020-08-111-296/+276
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c156704ff0 FindLAPACK: Use find_package_handle_standard_args Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5110
| * | | | | | | FindLAPACK: Use find_package_handle_standard_argsSeth R Johnson2020-08-071-296/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LAPACK previously used custom and verbose output messages.
* | | | | | | | Merge topic 'bootstrap-ninja'Brad King2020-08-116-76/+315
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 491dddfbde Bootstrap: Add support for Ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3652
| * | | | | | | | Bootstrap: Add support for NinjaKyle Edwards2020-08-106-76/+315
| |/ / / / / / /
* | | | | | | | Merge branch 'release-3.18'Brad King2020-08-110-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge topic 'findhdf5-fix-nohl' into release-3.18Brad King2020-08-111-1/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e038107ee7 FindHDF5: fix compiler detection when HL is disabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5112
* | \ \ \ \ \ \ \ Merge topic 'findhdf5-fix-nohl'Brad King2020-08-111-1/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e038107ee7 FindHDF5: fix compiler detection when HL is disabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5112
| * | | | | | | | FindHDF5: fix compiler detection when HL is disabledSeth R Johnson2020-08-101-1/+0
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A valid HDF5 installation with the "high level" extensions not configured will *fail* to be correctly detected by CMake since commit d9e39f3f89 (FindHDF5: check that compiler wrapper can compile a minimal program, 2020-02-10, v3.18.0-rc1~744^2~1): ``` /.../hdf5/cmake_hdf5_test.c:2:10: fatal error: 'hdf5_hl.h' file not found ``` This does not stop the configuration but does prevent flags and libraries from being recognized.
* | | | | | | | Merge branch 'release-3.18'Brad King2020-08-110-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'osx-archs-apple-only' into release-3.18Brad King2020-08-111-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70ce1ad64a PCH: Avoid Apple-specific architecture flags on other platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5118
* | \ \ \ \ \ \ \ Merge topic 'osx-archs-apple-only'Brad King2020-08-111-0/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70ce1ad64a PCH: Avoid Apple-specific architecture flags on other platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5118
| * | | | | | | | PCH: Avoid Apple-specific architecture flags on other platformsBrad King2020-08-101-0/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f593b354da (PCH: Add support for multi architecture iOS projects, 2020-04-02, v3.18.0-rc1~414^2) the `OSX_ARCHITECTURES` target property (and corresponding `CMAKE_OSX_ARCHITECTURES` variable) affects flags on non-Apple platforms by accident. Add a missing condition to avoid this. Fixes: #21072
* | | | | | | | Merge branch 'release-3.17'Brad King2020-08-110-0/+0
|\ \ \ \ \ \ \ \