summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.18'Brad King2020-08-190-0/+0
|\
| * Merge topic 'ep-patch-skip-update-dep' into release-3.18Brad King2020-08-191-27/+5
| |\ | | | | | | | | | | | | | | | | | | | | | 715324742f ExternalProject: Stop configure target from always appearing out-of-date c0b7198ad9 ExternalProject: Stop patch target from always appearing out-of-date Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5136
* | \ Merge topic 'ep-patch-skip-update-dep'Brad King2020-08-191-27/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 715324742f ExternalProject: Stop configure target from always appearing out-of-date c0b7198ad9 ExternalProject: Stop patch target from always appearing out-of-date Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5136
| * | ExternalProject: Stop configure target from always appearing out-of-dateCraig Scott2020-08-181-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | When updates are disconnected, don't depend on skip-update because that target is always considered out of date. Depend directly on the patch target instead because it already depends on the appropriate target regardless of whether updates are disconnected or not. This in turn means nothing depends on the skip-update target, so it has also been removed. Relates: #21086
| * | ExternalProject: Stop patch target from always appearing out-of-dateCraig Scott2020-08-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The skip-update target is always considered out-of-date. The change in 7249ba9677 (ExternalProject: Enforce that patch depends on update, 2020-04-03) made the patch target depend on skip-update, which in turn made it always out of date too. The patch command should only be re-run if the download needs to be performed again where updates are disconnected. Fixes: #21086
* | | Merge branch 'release-3.18'Brad King2020-08-190-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'llvm-rc-quote-cmake' into release-3.18Brad King2020-08-191-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 3937536d16 llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5139
* | \ \ Merge topic 'llvm-rc-quote-cmake'Brad King2020-08-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 447dfddb20 Merge branch 'backport-3.18-llvm-rc-quote-cmake' into llvm-rc-quote-cmake 3937536d16 llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5139
| * \ \ \ Merge branch 'backport-3.18-llvm-rc-quote-cmake' into llvm-rc-quote-cmakeBrad King2020-08-181-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECTThomas Bernard2020-08-181-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | When the installation path to cmake includes spaces, the `<CMAKE_COMMAND>` is required to have proper quotation of the cmake call. Fixes: #21095
* | | | Merge branch 'release-3.18'Brad King2020-08-190-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'FindPython-enhance-version-extraction-from-lib-name' into ↵Brad King2020-08-191-3/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.18 72822e26c9 FindPython: enhance robustness of version extraction from library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5135
* | \ \ \ Merge topic 'FindPython-enhance-version-extraction-from-lib-name'Brad King2020-08-191-3/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 72822e26c9 FindPython: enhance robustness of version extraction from library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5135
| * | | | FindPython: enhance robustness of version extraction from library nameMarc Chevrier2020-08-181-3/+4
| | |_|/ | |/| | | | | | | | | | Fixes: #21105
* | | | Merge branch 'release-3.18'Brad King2020-08-190-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'CMakeFindBinUtils-fallback' into release-3.18Brad King2020-08-191-0/+13
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 6896e50967 CMakeFindBinUtils: Always consider plain binutils when not cross-compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5137
* | | | Merge topic 'CMakeFindBinUtils-fallback'Brad King2020-08-191-0/+13
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 6896e50967 CMakeFindBinUtils: Always consider plain binutils when not cross-compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5137
| * | | CMakeFindBinUtils: Always consider plain binutils when not cross-compilingRobert Maynard2020-08-181-0/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Since commit c5dd2ca538 (DetermineCompiler: Relax _CMAKE_TOOLCHAIN_PREFIX detection, 2020-03-25, v3.18.0-rc1~430^2), `_CMAKE_TOOLCHAIN_PREFIX` may be set even when not cross-compiling. In this case we may still need to use binutils without any prefix. Fixes: #21103
* | | CMake Nightly Date StampKitware Robot2020-08-191-1/+1
| |/ |/|
* | Merge topic 'FixGraphvizAliasTargets'Brad King2020-08-1819-3/+33
|\ \ | | | | | | | | | | | | | | | | | | f7dd74e4ef Graphviz: Fix bug that shows duplicated alias targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5134
| * | Graphviz: Fix bug that shows duplicated alias targetsStephan Rohmen2020-08-1719-3/+33
| | | | | | | | | | | | When using subdirectories the alias targets were duplicated
* | | Merge topic 'fotran_module_vs_docs'Brad King2020-08-181-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c5407b95f0 Help: Expand Fortran_MODULE_DIRECTORY documentation. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5128
| * | | Help: Expand Fortran_MODULE_DIRECTORY documentation.Petr Kmoch2020-08-171-0/+8
| | | | | | | | | | | | | | | | | | | | Document how Visual Studio generators append per-configuration directory to path where Fortran modules are created.
* | | | Merge topic 'findhdf5-targets'Brad King2020-08-181-2/+149
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5eff274017 FindHDF5: Remove VTK library type detection a8e0a6b3e4 FindHDF5: Port changes from VTK Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5129
| * | | | FindHDF5: Remove VTK library type detectionSeth R Johnson2020-08-141-5/+2
| | | | |
| * | | | FindHDF5: Port changes from VTKBen Boeckel2020-08-141-2/+152
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-08-181-1/+1
| | | | |
* | | | | 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