summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cxx-as-objcxx' into release-3.18Brad King2020-09-302-2/+2
|\ | | | | | | | | | | | | 8a2977ba55 OBJCXX: Fix regression for compiling cpp files as objcxx Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5296
| * OBJCXX: Fix regression for compiling cpp files as objcxxCristian Adam2020-09-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | In commit 8d61294c3e (PCH: Mark CMake PCH source files as -x <lang>-header, 2020-09-04, v3.18.3~14^2) we removed the explicit `-x objective-c++` flag. This broke cases with custom source extensions. Restore the explicit `-x objective-c[++]` flag and put it before the `<FLAGS>` placeholder. The latter will contain the proper `-x objective-c[++]-header` value and will override the `-x objective-c[++]` value set before. Fixes: #21234
* | Merge topic 'cuda-11.1-sm86' into release-3.18Brad King2020-09-301-3/+13
|\ \ | |/ |/| | | | | | | | | 5f6b0ba8b1 FindCUDA/select_compute_arch: Add CUDA 11.1 and SM86 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5292
| * FindCUDA/select_compute_arch: Add CUDA 11.1 and SM86 supportzasdfg bnm2020-09-291-3/+13
| |
* | Merge topic 'FindJNI-aarch64' into release-3.18Brad King2020-09-281-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | 696d16ae6c FindJNI: Add aarch64 support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Vitaly Lipatov <lav@etersoft.ru> Merge-request: !5275
| * | FindJNI: Add aarch64 supportBrad King2020-09-251-1/+1
| |/ | | | | | | | | | | | | Extend the fix from commit 44dffbcc94 (FindJNI: Add arm64 support, 2020-08-25, v3.18.3~21^2) to cover the `aarch64` name too. Fixes: #21237
* | Merge topic 'clang-llvm-lib' into release-3.18Brad King2020-09-251-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | f5d3da091b Clang: Look for llvm-lib when using MSVC-like front-end Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr> Merge-request: !5264
| * | Clang: Look for llvm-lib when using MSVC-like front-endShoaib Meenai2020-09-241-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 55196a1440 (MSVC: Use 'lib' instead of 'link /lib' to create static libraries, 2020-01-10, v3.18.0-rc1~625^2) we changed CMake to use lib instead of `link /lib` to create static libraries, but it didn't search for `llvm-lib`. If you have `llvm-lib` but not `lib` (e.g. when cross-compiling), when `CMakeFindBinutils` is invoked for the `C` and `CXX` languages, `CMAKE_AR` is not found. When it's subsequently invoked for the ASM language, `CMAKE_ASM_SIMULATE_ID` and `CMAKE_ASM_COMPILER_FRONTEND_VARIANT` are not set (because `CMakeDetermineASMCompiler` doesn't call `CMAKE_DETERMINE_COMPILER_ID`, which sets those variables), so we go down the non-MSVC conditional and set `CMAKE_AR` to a GNU-style `ar`, which of course does not understand lib flags. Explicitly search for `llvm-lib` to avoid this situation.
* | FindPython: Fix erroneous regex in ABI checkMarc Chevrier2020-09-231-1/+1
|/ | | | | | | | A regex added by commit 6fdfe2428d (FindPython: enhance ABI checks against include directory, 2020-09-02, v3.18.3~17^2) was missing a backslash. Fixes: #21223
* Merge branch 'backport-3.17-check-compiler-flag-result'Brad King2020-09-212-2/+0
|\
| * Check*CompilerFlag: Do not set result as a normal variable tooBrad King2020-09-212-2/+0
| | | | | | | | | | | | | | | | | | Refactoring in commit cb984c6627 (Check*CompilerFlag: Modernize modules, 2019-12-09, v3.17.0-rc1~320^2) accidentally left the result set as a normal variable in addition to as a cache entry. This is not specified by the documentation, and is not the behavior in CMake 3.16 and below. Fixes: #21207
* | FindMatlab: add R2020b => 9.9Michael Hirsch2020-09-171-0/+1
| |
* | ARMClang: Fix link line generation after addition of armlink supportMarc Chevrier2020-09-101-2/+3
| | | | | | | | | | | | | | Revise logic added by commit 73fb6ac82b (ARMClang: Add support for armlink, 2020-06-02, v3.18.0-rc1~27^2). Fixes: #21154
* | Merge topic 'ios-pch-x-lang-header' into release-3.18Brad King2020-09-094-4/+19
|\ \ | | | | | | | | | | | | | | | | | | 8d61294c3e PCH: Mark CMake PCH source files as -x <lang>-header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5188
| * | PCH: Mark CMake PCH source files as -x <lang>-headerCristian Adam2020-09-044-4/+19
| | | | | | | | | | | | Fixes: #21163
* | | FindPython: CMP0012 must be set to NEWMarc Chevrier2020-09-071-1/+11
|/ / | | | | | | Fixes: #21168
* | FindPython: enhance ABI checks against include directoryMarc Chevrier2020-09-021-8/+18
| | | | | | | | Fixes: #21149
* | UseSWIG: Update option -interface usageMarc Chevrier2020-08-311-1/+9
| | | | | | | | | | | | | | Option -interface must not be used if multiple SWIG files are part of the same library. Fixes: #21134
* | Merge topic 'FindJNI-arm64' into release-3.18Brad King2020-08-261-0/+2
|\ \ | | | | | | | | | | | | | | | | | | 44dffbcc94 FindJNI: Add arm64 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5162
| * | FindJNI: Add arm64 supportMalcolm Parsons2020-08-251-0/+2
| | | | | | | | | | | | On 64-bit ARM, JVM directories have an arm64 suffix.
* | | Merge topic 'cuda-std-for-msvc' into release-3.18Brad King2020-08-261-4/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bed315a0da CUDA: Support setting CUDA14/17 when using MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5160
| * | | CUDA: Support setting CUDA14/17 when using MSVCRobert Maynard2020-08-241-4/+6
| |/ / | | | | | | | | | Fixes #20953
* | | MSVC: Record support for c_static_assertRaul Tambre2020-08-202-3/+5
|/ / | | | | | | Supported since MSVC 19.28.29115 (VS 16.8.0 Preview 1.0).
* | Merge topic 'FindMPI-cuda-pthread' into release-3.18Brad King2020-08-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | 47abe5f225 FindMPI: Fix regression in pthread guard Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5147
| * | FindMPI: Fix regression in pthread guardAxel Huebl2020-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression with MPI and CUDA<10.2 that did let `-pthread` flags slip to nvcc again. In commit b725a19072 (FindMPI: Deny -fexceptions from NVCC, 2020-07-02, v3.18.0-rc4~12^2) we accidentally forgot to use the variable containing the replacement result. Fixes: #21108
* | | 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
| * | | 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 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
| * | | | 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 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
| * | | FindPython: enhance robustness of version extraction from library nameMarc Chevrier2020-08-181-3/+4
| |/ / | | | | | | | | | Fixes: #21105
* | | 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
* | 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 topic 'msvc_c11' into release-3.18Brad King2020-08-122-12/+33
|\ \ | | | | | | | | | | | | | | | | | | 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-112-12/+33
| | | | | | | | | | | | | | | | | | | | | MSVC >=19.27 supports a C11 switch. The `c_restrict` feature has also been implemented. Fixes: #21069
* | | Merge topic 'FindPython-manage-SOABI-in-all-versions' into release-3.18Brad King2020-08-121-12/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 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-111-12/+4
| | | | | | | | | | | | Fixes: #21070
* | | 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
| * | | 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 topic 'automoc-path-prefix-off' into release-3.18Brad King2020-08-111-1/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b5be34811 Help: Add 3.18.2 release note about AUTOMOC_PATH_PREFIX default change db659e18bc Merge branch 'backport-3.17-automoc-path-prefix-off' e503fbe38a Merge branch 'backport-3.16-automoc-path-prefix-off' 4c33b305a0 Autogen: Turn off moc path prefix generation by default 56510b7d85 Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.17 effc9a1032 Merge branch 'backport-3.17-automoc_timestamp_deps' into release-3.17 507fecd7e2 Merge branch 'ninja-multi-rsp-remove-path' into release-3.17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5105
| * | | Merge branch 'backport-3.17-automoc-path-prefix-off'Brad King2020-08-101-1/+3
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'backport-3.16-automoc-path-prefix-off'Brad King2020-08-101-1/+3
| | |\ \
| | | * | Autogen: Turn off moc path prefix generation by defaultJoerg Bornemann2020-08-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default value of `CMAKE_AUTOMOC_PATH_PREFIX` to `OFF` to restore compatibility with behavior of CMake 3.15 and below. C++ source files that are generated by Qt's meta object compiler (moc) include the header file that was passed as input argument to moc. This is usually a path relative to the source directory, for example #include "../../source/dir/myobject.h" That is problematic for reproducible builds as described in #18815. To cope with that, the target property AUTOMOC_PATH_PREFIX was introduced in CMake 3.16 by commit d018d27c10 (Autogen: Add moc path prefix generation (AUTOMOC_PATH_PREFIX), 2019-09-13, v3.16.0-rc1~94^2~4). The property is default-initialized from the variable `CMAKE_AUTOMOC_PATH_PREFIX`, which defaults to `ON`. If this property is ON, and myobject.h is located in an include directory of the target, moc-generated C++ files include the file without the "path prefix": #include "myobject.h" This behavior, however, can break projects that have equally named header files in different include directories. As "not breaking existing projects" trumps "have reproducible builds by default" we change the default of `CMAKE_AUTOMOC_PATH_PREFIX` to `OFF`. Also, it is now possible to pass `-DCMAKE_AUTOMOC_PATH_PREFIX=ON` on the CMake command line. Before, it was overridden in `CMakeGenericSystem`. Fixes: #20598 Issue: #18815
| | | * | Merge branch 'backport-3.16-objc-env-vars' into release-3.16Brad King2020-05-142-18/+24
| | | |\ \
| | | * \ \ Merge branch 'pch-msvc-pragma' into release-3.16Brad King2020-05-111-7/+5
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4736
| | | * \ \ \ Merge branch 'FindGTK2-harfbuzz-target' into release-3.16Brad King2020-05-091-3/+6
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4725
| | | * \ \ \ \ Merge branch 'backport-3.16-FindPkgConfig-isystem' into release-3.16Brad King2020-05-061-8/+42
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4693
| | | * \ \ \ \ \ Merge branch 'CheckLanguage-cuda-host' into release-3.16Brad King2020-05-051-1/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4711
| | * | \ \ \ \ \ \ Merge branch 'FindOpenSSL-3.0' into release-3.17Brad King2020-06-081-2/+4
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4860
generated by cgit v0.12 at 2024-09-20 14:53:22 (GMT)