summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'SWIG'Brad King2021-04-261-7/+16
|\ | | | | | | | | | | | | e3e005dbd8 UseSWIG: use swig dependencies for Xcode generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6042
| * UseSWIG: use swig dependencies for Xcode generatorMarc Chevrier2021-04-231-7/+16
| |
* | Merge topic 'lzma-threads'Brad King2021-04-261-8/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5c130e675 cmArchiveWrite: Consolidate multiple ways to set thread count 5380d858ff liblzma: Enable multi threaded stream encoding support e9065e96dc Merge branch 'upstream-liblzma' into lzma-threads ee909a8e8b liblzma 2020-03-17 (2327a461) 741b85b42b liblzma: Revise update script to get version 5.2.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6014
| * | cmArchiveWrite: Consolidate multiple ways to set thread countNils Gladitz2021-04-221-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge use of SetFilterOption() into more abstract thread count in cmArchiveWrite constructor. libarchive defaulting of threads for threads == 0 seems to be configuration dependent. Preemptively default thread count via std::thread::hardware_concurrency(). Also allow negative values for the thread count in which case the detected hardware concurrency is also used but the given absolute thread count is used as an upper limit.
| * | liblzma: Enable multi threaded stream encoding supportNils Gladitz2021-04-221-3/+4
| |/
* | Merge topic 'doc-compile-features-wcdh'Brad King2021-04-261-0/+125
|\ \ | | | | | | | | | | | | | | | | | | | | | 1f4ec3f4a7 Help: Do not recommend WCDH in cmake-compile-features(7) 1cc63f2cd5 Help: Fix typos in cmake-compile-features(7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6037
| * | Help: Do not recommend WCDH in cmake-compile-features(7)Brad King2021-04-231-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit da7ad7997e (WriteCompilerDetectionHeader: Add policy to remove module, 2020-12-04, v3.20.0-rc1~350^2), the WCDH module is deprecated. Update the `cmake-compile-features(7)` manual section that previously recommended WCDH to make such detection the project's responsibility instead. Move the old content of the section over to the WCDH module to preserve it.
* | | Merge topic 'cuda-host-compiler-windows'Brad King2021-04-233-22/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 625ef88a92 CUDA: Add CMAKE_CUDA_HOST_COMPILER support on Windows non-VS generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6030
| * | | CUDA: Add CMAKE_CUDA_HOST_COMPILER support on Windows non-VS generatorsunknown2021-04-223-22/+14
| | | |
* | | | ExternalData: Improve error message when we fail to create a fileBrad King2021-04-221-1/+1
| |_|/ |/| | | | | | | | Report the underlying system error.
* | | FindLAPACK: Fix finding generic LAPACK with BLA_STATICBrad King2021-04-211-1/+9
| | | | | | | | | | | | Fixes: #21071
* | | Find{BLAS,LAPACK}: Simplify search for static librariesBrad King2021-04-212-44/+26
| | | | | | | | | | | | | | | | | | | | | | | | Now that `CHECK_{BLAS,LAPACK}_LIBRARIES` are functions, we can set `CMAKE_FIND_LIBRARY_SUFFIXES` locally without affecting the global state. This avoids the need for local state switching that was added in commit 9ef82d95d8 (FindBLAS: Fix detection of OpenMP as dependency of BLA_STATIC, 2021-04-07, v3.20.1~3^2), so remove that.
* | | Find{BLAS,LAPACK}: Simplify check_function_exists state maintenanceBrad King2021-04-212-9/+2
|/ / | | | | | | | | Now that `CHECK_{BLAS,LAPACK}_LIBRARIES` are functions, we can set `CMAKE_REQUIRED_QUIET` locally without affecting the global state.
* | Merge topic 'cxxprefix'Brad King2021-04-191-1/+1
|\ \ | |/ | | | | | | | | | | | | 4c741d945a BinUtils: Restore toolchain prefix detection from compiler name 'c++' Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr> Merge-request: !6011
| * BinUtils: Restore toolchain prefix detection from compiler name 'c++'Lihua Zhao2021-04-161-1/+1
| | | | | | | | | | | | | | | | | | Since commit b12aec6c8d (BinUtils: prefer bin utils matching the compiler version extension, 2020-12-11, v3.20.0-rc1~171^2) we recognize `clangg++` and `g++` but not `c++`. Restore `[gc]` in place of `g` in the regex, as we had before that change. Fixes: #22069
| * Merge topic 'flags-with-backslash' into release-3.20Brad King2021-04-081-5/+6
| |\ | | | | | | | | | | | | | | | | | | 3953dfcb31 Restore support for backslashes in initial language-wide flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5995
| * \ Merge topic 'cuda-depfile-ccbin' into release-3.20Brad King2021-04-082-1/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e38985db7 Makefiles: Fix dependency extraction with CUDA < 10.2 and host compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Merge-request: !5992
* | \ \ Merge topic 'fujitsu-fixup'Brad King2021-04-162-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc0d2004b2 Fujitsu: Fix C90 standard flags ec78e86cc8 FujitsuClang: Use GNU-like command-line Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5997
| * | | | Fujitsu: Fix C90 standard flagsPaul Zehner2021-04-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Fix typos from commit 3c867cff4a (Fujitsu: Add support for the Fujitsu compiler in Trad mode, 2020-12-22).
| * | | | FujitsuClang: Use GNU-like command-linePaul Zehner2021-04-141-0/+2
| | | | |
* | | | | Find{BLAS,LAPACK}: Make library variable names more robustBrad King2021-04-142-10/+12
| | | | |
* | | | | Find{BLAS,LAPACK}: Generalize recognition of dependencies as link flagsBrad King2021-04-142-4/+4
| | | | |
* | | | | Find{BLAS,LAPACK}: Convert internal CHECK_*_LIBRARIES to functionsBrad King2021-04-142-47/+32
| | | | |
* | | | | Find{BLAS,LAPACK}: Clarify name of internal argument for dependenciesBrad King2021-04-142-10/+10
| | | | |
* | | | | Find{BLAS,LAPACK}: Simplify appending to list of librariesBrad King2021-04-142-6/+6
| | | | |
* | | | | Find{BLAS,LAPACK}: Revert bad refactoring of internal CHECK_*_LIBRARIESBrad King2021-04-142-14/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 4c74c86f40 (FindBLAS/LAPACK: Add support for the Fujitsu SSL2 library, 2021-01-27) was done in order to support calling `find_library` on the dependencies as well as the candidate libraries. However, it broke a few things: * Intel MKL's BLAS/LAPACK are no longer found. We specify their dependencies using `-l...` flags, so we should not try to use `find_library` for them. * The dependencies are repeated because we accumulate them in the `find_library` search loop and then append them at the end too. Revert the incorrect part of the refactoring. Retain the flags part needed for the Fujitsu vendor. Fixes: #22056
* | | | Merge topic 'find_threads_only_log_on_failure'Brad King2021-04-081-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6da6784bf FindThreads: Reduce amount of false positive error logging Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5988
| * | | | FindThreads: Reduce amount of false positive error loggingRobert Maynard2021-04-061-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a CMake based project fails, users start looking at CMakeError.log and think that the FindThread output is the problem, but it is a false positive. Now FindThreads only logs to `CMakeError.log` when it fails to find a suitable flag, reducing the amount of false positives in `CMakeError.log`. Fixes #16540, Fixes #19344
* | | | | Merge topic 'flags-with-backslash'Brad King2021-04-081-5/+6
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 3953dfcb31 Restore support for backslashes in initial language-wide flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5995
| * | | | Restore support for backslashes in initial language-wide flagsBrad King2021-04-071-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit bdc40742bd (CMakeDetermineCompilerId: Test without COMPILER_ID_FLAGS if REQUIRE_SUCCESS, 2021-02-27, v3.20.0-rc3~6^2) added an extra macro layer through which flag strings are passed. That caused an extra level of argument re-parsing, and broke flags with backslashes. Pass flags to the helper macro through variable names instead. Fixes: #22041
* | | | | Merge topic 'cuda-depfile-ccbin'Brad King2021-04-082-1/+12
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e38985db7 Makefiles: Fix dependency extraction with CUDA < 10.2 and host compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Merge-request: !5992
| * | | | Makefiles: Fix dependency extraction with CUDA < 10.2 and host compilerBrad King2021-04-072-1/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2c71d051fa (Makefiles Generators: use compiler for dependencies generation, 2020-10-18, v3.20.0-rc1~392^2) we invoke `nvcc` for CUDA < 10.2 a second time in order to generate a depfile. When `CMAKE_CUDA_HOST_COMPILER` is set, the second invocation is missing its `-ccbin=` option, even after refactoring in commit 8981e3e7cc (NVIDIA-CUDA: rely on new capabilities for deps generation, 2020-12-02, v3.20.0-rc1~362^2). Ideally we should move the `-ccbin=` flag into `Compiler/NVIDIA-CUDA`, but that will add `CMAKE_CUDA_HOST_COMPILER` support on Windows in command-line generators but not the Visual Studio generators. For now, add the flag to the depfile command specifically. Fixes: #22037
* | | | Merge topic 'FindBLAS-default-OpenMP'Brad King2021-04-081-2/+11
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 9ef82d95d8 FindBLAS: Fix detection of OpenMP as dependency of BLA_STATIC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5993
| * | | FindBLAS: Fix detection of OpenMP as dependency of BLA_STATICBrad King2021-04-071-2/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the change from commit f7f3d8987a (FindBLAS: Add dependency of OpenBLAS on OpenMP for BLA_STATIC, 2020-11-10, v3.20.0-rc1~492^2): * If C is not enabled, find CXX OpenMP libraries instead. * Do not use BLA_STATIC's custom CMAKE_FIND_LIBRARY_SUFFIXES for OpenMP. It can break projects that already call `find_package(OpenMP)` and expect a shared library. Whether OpenMP is static is orthogonal to whether BLAS is static. Fixes: #22039 Issue: #16221
| * | Merge topic 'binutils-var-private' into release-3.20Brad King2021-04-071-10/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4d786dfcfa BinUtils: Avoid clobbering a variable named without a private prefix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5986
| * \ \ Merge topic 'ios-rpath-linker-flag' into release-3.20Brad King2021-04-071-5/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4aed96e230 Apple: Set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG on non-macOS too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5980
| * \ \ \ Merge topic 'nvhpc-lib-arch' into release-3.20Brad King2021-04-064-18/+52
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 764606e256 CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths 5d44d73bbe CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5984
| * \ \ \ \ Merge topic 'UseSWIG-policies' into release-3.20Brad King2021-04-061-15/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3d0b25514 UseSWIG: Transform swig depfile to match Ninja generator paths 8c525d7e16 UseSWIG: Run using policy settings from includer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5983
* | \ \ \ \ \ Merge topic 'binutils-var-private'Brad King2021-04-071-10/+10
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d786dfcfa BinUtils: Avoid clobbering a variable named without a private prefix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5986
| * | | | | | BinUtils: Avoid clobbering a variable named without a private prefixBrad King2021-04-071-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit b12aec6c8d (BinUtils: prefer bin utils matching the compiler version extension, 2020-12-11, v3.20.0-rc1~171^2) accidentally leaked a `TOOL` variable. Name temporary variables with a private prefix. Fixes: #22035
* | | | | | | Merge topic 'ios-rpath-linker-flag'Brad King2021-04-071-5/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4aed96e230 Apple: Set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG on non-macOS too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5980
| * | | | | | Apple: Set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG on non-macOS tooCraig Scott2021-04-061-5/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since CMake 3.19, we no longer support macOS SDKs older than 10.5, which corresponds to Xcode 3. Supporting older Xcode versions for device platforms is also not realistic. We therefore expect the -rpath linker option should always be supported now. When targeting iOS, tvOS or watchOS, the previous disabling of -rpath support meant that the install_name_dir of shared libraries and frameworks was unable to use @rpath. This resulted in embedding absolute paths for their install_name. When they were embedded in an app bundle, this would cause the app to fail at runtime. By enabling the -rpath linker option, the default install_name_dir is now @rpath for these platforms, which results in binaries that do work at runtime. Fixes: #20036
* | | | | | FindHDF5: add compiler-specific module search pathsBen Boeckel2021-04-061-2/+17
| | | | | |
* | | | | | FindHDF5: track the "main" library for each languageBen Boeckel2021-04-061-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | This will be used to build up additional include paths to search.
* | | | | | FindHDF5: find include directories after the libraryBen Boeckel2021-04-061-20/+20
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Some include paths might depend on the library location (primarily for Fortran).
* | | | | Merge topic 'nvhpc-lib-arch'Brad King2021-04-064-18/+52
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 764606e256 CMakeDetermineCompilerABI: Extract lib arch from implicit object file paths 5d44d73bbe CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5984
| * | | | CMakeDetermineCompilerABI: Extract lib arch from implicit object file pathsRobert Maynard2021-04-053-11/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NVHPC compiler does not have any implicit link directories that can be used to detect `CMAKE_LIBRARY_ARCHITECTURE`, but it does have implicit object files. Extract implicit object file paths from link lines and check them for the `CMAKE_LIBRARY_ARCHITECTURE` pattern. Issue: #22024
| * | | | CMakeDetermineCompilerABI: Revert "Parse library arch from versioned paths"Robert Maynard2021-04-052-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit 657fc3a9a7 (CMakeDetermineCompilerABI: Parse library arch from versioned paths, 2021-02-03, v3.20.0-rc1~40^2) caused `CMAKE_LIBRARY_ARCHITECTURE` to be populated on non-multiarch platforms if their compilers happen to use `$arch/$version` library directories. Revert the use of versioned library paths. Fixes: #22024
* | | | | Merge topic 'UseSWIG-policies'Brad King2021-04-061-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05881c1cbe Merge branch 'backport-UseSWIG-policies' into UseSWIG-policies c3d0b25514 UseSWIG: Transform swig depfile to match Ninja generator paths 8c525d7e16 UseSWIG: Run using policy settings from includer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5983
| * \ \ \ \ Merge branch 'backport-UseSWIG-policies' into UseSWIG-policiesBrad King2021-04-051-0/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
generated by cgit v0.12 at 2025-01-22 18:19:56 (GMT)