summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-ifw-3.2' into release-3.18Brad King2020-06-091-0/+2
|\ | | | | | | | | | | | | b79aad8069 CPack/IFW: Add Qt installer framework version 3.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4859
| * CPack/IFW: Add Qt installer framework version 3.2Frederik Gladhorn2020-06-081-0/+2
| | | | | | | | Qt 5.15 comes with IFW 3.2
* | Merge topic 'FindOpenSSL-3.0' into release-3.18Brad King2020-06-091-2/+4
|\ \ | |/ |/| | | | | | | | | 796b447373 FindOpenSSL: Fix OpenSSL 3.0.0 version extraction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4860
| * FindOpenSSL: Fix OpenSSL 3.0.0 version extractionBilly Brumley2020-06-081-2/+4
| | | | | | | | | | | | | | | | Fix the regex syntax added by commit 61d746e592 (FindOpenSSL: Detect OpenSSL 3.0.0, 2020-05-27, v3.17.3~1^2). Add missing escapes. Test with `openssl-3.0.0-alpha3`. While at it, also unset a temporary variable after use.
* | CPack/IFW: Fix documentation typo: REQUAREDFrederik Gladhorn2020-06-081-1/+1
| |
* | Merge topic 'cuda_cudart_status' into release-3.18Brad King2020-06-081-4/+4
|\ \ | | | | | | | | | | | | | | | | | | 7e2f86461a FindCUDAToolkit: Fix cudart not found status message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4861
| * | FindCUDAToolkit: Fix cudart not found status messageRaul Tambre2020-06-081-4/+4
| | | | | | | | | | | | | | | | | | This ended up after the searching after commit dc2eae1 (FindCUDAToolkit: Factor out discovery code into a separate file, 2020-04-22). Move it back to where it was and should be.
* | | Merge topic 'cuda_clang_simulate' into release-3.18Brad King2020-06-081-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0f88b7a592 CUDA: Fix Clang depfile flags when simulating MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4863
| * | | CUDA: Fix Clang depfile flags when simulating MSVCRaul Tambre2020-06-081-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | __compiler_clang() doesn't call __compiler_gnu() if we're emulating MSVC. Thus CMAKE_DEPFILE_FLAGS_CUDA remains unset and compiling doesn't work, due to NVCC dependency injection workaround in CMakeCUDAInformation.cmake, which triggers for Ninja if they're not set. Always set the depfile flags to fix this. Most other compiler modules seem to do the same.
* | | Merge topic 'cuda_user_architectures_specifiers' into release-3.18Brad King2020-06-081-2/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4eaf1ef425 CUDA: Fix checking working architectures with specifiers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4856
| * | CUDA: Fix checking working architectures with specifiersRaul Tambre2020-06-051-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't distinguish real/virtual architectures during compiler detection. If the user passes -DCMAKE_CUDA_ARCHITECTURES="70-virtual" we'll test with only the real architecture. If it works "architectures" will end up as "70". We check equality using strings, so this fails and we incorrectly throw an error. Fix this by comparing against CMAKE_CUDA_ARCHITECTURES with the specifiers stripped. We need to deduplicate tested_architectures for the same reason in case the user specified something like "70-real;70-virtual".
* | | ARMClang: allow fallback to -march and correct setting of --cpu flagsOsama Moharam2020-06-031-10/+57
|/ / | | | | | | | | | | | | allows cmake to fall back to CMAKE_SYSTEM_ARCH in case CMAKE_SYSTEM_PROCESSOR is not in armclang -mcpu=list additionally checks if CMAKE_SYSTEM_PROCESSOR belongs to armlink --cpu=list Fixes: #19962
* | Merge topic 'armclang-armlink'Brad King2020-06-031-2/+14
|\ \ | | | | | | | | | | | | | | | | | | 73fb6ac82b ARMClang: Add support for armlink Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4811
| * | ARMClang: Add support for armlinkOsama Moharam2020-06-021-2/+14
| | | | | | | | | | | | | | | | | | sets CMAKE_LIBRARY_PATH_FLAG to '--userlibpath=' when using armlink. Fixes: #20761
* | | Merge branch 'backport-3.17-pch-no-Fortran' into pch-no-FortranBrad King2020-06-022-13/+17
|\ \ \ | |/ / |/| |
| * | PCH: Do not enable GNU or Intel PCH settings for FortranBrad King2020-06-022-11/+15
| |/ | | | | | | | | | | | | | | | | The PCH settings are shared by C and CXX languages but do not make sense for Fortran. In particular, `CMAKE_PCH_EXTENSION` should not be set because it can overwrite the value set for C/C++ languages, which may have a different compiler vendor than the Fortran compiler. Fixes: #20752
* | Merge topic 'UseSWIG-note-dep-strategy'Brad King2020-06-021-0/+8
|\ \ | | | | | | | | | | | | | | | | | | 1f543b23a8 UseSWIG: note dependency behavior for Make generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4834
| * | UseSWIG: note dependency behavior for Make generatorsBen Boeckel2020-06-011-0/+8
| | | | | | | | | | | | See: #20067
* | | Merge topic 'macos-sdk-libraries'Brad King2020-06-021-5/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 444dbd40de Darwin: honour `CMAKE_OSX_SYSROOT` more faithfully Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4779
| * | | Darwin: honour `CMAKE_OSX_SYSROOT` more faithfullySaleem Abdulrasool2020-05-311-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The libraries in the SDK should be given precedence over the system libraries. Check for the default library search path (in default order) of `/usr/lib` and `/usr/local/lib` and use these as system prefix paths for libraries when performing the link step against a specified SDK.
* | | | ASM: Fix preprocessor definition flags for GNU 'as' toolKyle Edwards2020-06-011-0/+1
| |/ / |/| | | | | | | | Fixes: #20780
* | | Merge topic 'fc-ep-git-update-strategy'Brad King2020-06-012-59/+75
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8aa4d51ec5 ExternalProject: Add missing release note for git update strategy 1236590507 FetchContent: Pass through CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY if set e71c2807ba ExternalProject: Remote checkout needs to include the remote name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4818
| * | | FetchContent: Pass through CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY if setCraig Scott2020-05-291-6/+11
| | | | | | | | | | | | | | | | | | | | This was missed when the initial support was added in commit 0aea435aa1 (ExternalProject: Provide choice of git update strategies, 2020-02-12)
| * | | ExternalProject: Remote checkout needs to include the remote nameCraig Scott2020-05-291-53/+64
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 0aea435aa1 (ExternalProject: Provide choice of git update strategies, 2020-02-12) added the git update strategies, but the CHECKOUT strategy was not handling remote refs correctly. The local ref would be checked out instead and no warning or error would have been emitted. The test that should have caught this was also malformed and did not actually move the local master branch as intended.
* | | CUDA: Detect non-working user-specified architectures on NVCCRaul Tambre2020-05-291-19/+35
|/ / | | | | | | | | | | | | | | | | | | | | Extend the improved error message added for Clang by commit 19cc5bc296 (CUDA: Throw error if user-specified architectures don't work, 2020-05-26) to cover NVCC as well. Also fix the error incorrectly being thrown if the user-specified list differed in order to the architectures parsed from the compiler output. Implements: #20757
* | Merge topic 'FindSubversion-xcode-removed'Brad King2020-05-291-2/+11
|\ \ | | | | | | | | | | | | | | | | | | 2c0db404d1 FindSubversion: Do not accept macOS stub without Xcode implementation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4813
| * | FindSubversion: Do not accept macOS stub without Xcode implementationBrad King2020-05-281-2/+11
| |/ | | | | | | | | Xcode no longer provides a `svn` implementation, but the `/usr/bin/svn` stub may still exist.
| * Merge topic 'openssl-3.0.0' into release-3.17Brad King2020-05-281-0/+9
| |\ | | | | | | | | | | | | | | | | | | 61d746e592 FindOpenSSL: Detect OpenSSL 3.0.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4805
* | \ Merge topic 'openssl-3.0.0'Brad King2020-05-281-0/+9
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 61d746e592 FindOpenSSL: Detect OpenSSL 3.0.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4805
| * | FindOpenSSL: Detect OpenSSL 3.0.0Vitezslav Cizek2020-05-271-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OpenSSL versioning is changing with the upcoming 3.0.0 release. https://www.openssl.org/blog/blog/2018/11/28/version/ Since 3.0.0, the patch letters are being dropped. The new format is: MAJOR.MINOR.PATCH The OPENSSL_VERSION variable can now be directly derived from the new OPENSSL_VERSION_STR macro. https://www.openssl.org/docs/manmaster/man3/OPENSSL_VERSION_NUMBER.html
* | | Merge topic 'fix-cpack-deb-generating-empty-paragraph'Brad King2020-05-281-0/+10
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 6ba842163c CPack-deb: don't add a line with a dot to pkg desc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4806
| * | CPack-deb: don't add a line with a dot to pkg descJonathan Verner2020-05-271-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if the package description ends with a newline (typically if it is read from a file) cpack -deb adds a single line with a dot at the end which leads to a violation of the `extended-description-contains-empty-paragraph` debian policy. This commit fixes the above behaviour. Fixes: #20763
| * | Merge topic 'cuda-default-runtime' into release-3.17Brad King2020-05-225-3/+35
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e55b21e24e CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchain 1086e930dc CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compile a4ea293153 Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4762
| * | | FindPython: use CMAKE specific variables to look-up debug libraryMarc Chevrier2020-05-181-2/+8
| | | | | | | | | | | | | | | | Fixes: #20714
* | | | Merge topic 'cuda_user_architectures'Brad King2020-05-271-6/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19cc5bc296 CUDA: Throw error if user-specified architectures don't work Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4800
| * | | | CUDA: Throw error if user-specified architectures don't workRaul Tambre2020-05-261-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if an user specified CMAKE_CUDA_ARCHITECTURES and they didn't work we would end up erroring during compiler testing. Instead check if the architectures we successfully compiled with are the same as the user-specified (if any). If they don't match, then throw a more helpful error than compiler testing would. Additionally, to make this work correctly I made it try all user-specified architectures at once instead of each separately. Implements: #20756
* | | | | Merge topic 'cuda_lib_x64'Brad King2020-05-271-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2df6f5446 CUDA: Check for lib/x64 library directory in Internal/CUDAToolkit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4799
| * | | | | CUDA: Check for lib/x64 library directory in Internal/CUDAToolkitRaul Tambre2020-05-261-0/+2
| |/ / / / | | | | | | | | | | | | | | | Fixes #20755.
* | | | | Update links to gitlab.kitware.com repos to add `-/`Brad King2020-05-267-8/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | GitLab now uses a `/-/` component between the `group/project` part of the URL and the `{issues,merge_requests,tree}` part so that it can support `group/subgroup/project` with arbitrary depth.
* | | | Merge topic 'reduce-initial-checks'Brad King2020-05-267-259/+266
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d21dd0f7c enable_language: Assume compiler works if ABI detection compiles 7a01250581 CMakeDetermineCompilerABI: Fold copy error into CMAKE_<LANG>_ABI_COMPILED Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4789
| * | | | enable_language: Assume compiler works if ABI detection compilesBrad King2020-05-256-258/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We run a `try_compile` with a tiny test source to check if the compiler works so that we can fail early if it does not. When the compiler does work, we immediately `try_compile` the ABI detection source. In the common case that both steps work, we gain no useful information from the first one and the work was wasted. Re-order the checks to try the ABI detection first. If it works then assume the compiler works and skip the dedicated check. If the ABI check fails then proceed with the normal test for a working compiler so the diagnostic can be shown as before. Fixes: #18703
| * | | | CMakeDetermineCompilerABI: Fold copy error into CMAKE_<LANG>_ABI_COMPILEDBrad King2020-05-251-1/+4
| | | | |
* | | | | Merge topic 'cuda-clang-pthreads'Brad King2020-05-262-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80d37167fe Find{Threads,MPI}: Add support for CUDA with Clang Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !4781
| * | | | | Find{Threads,MPI}: Add support for CUDA with ClangTobias Ribizel2020-05-252-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Currently CMake passes `-Xcompiler -pthread` flags to CUDA compilers irrespective of the actual CUDA compiler ID. This makes sure the additional `-Xcompiler` flag is only used with nvcc.
* | | | | Merge topic 'xerces-cygwin-library-naming'Brad King2020-05-261-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b59c127df2 FindXercesC: Find Cygwin libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4783
| * | | | | FindXercesC: Find Cygwin librariesRoger Leigh2020-05-231-2/+6
| | | | | |
* | | | | | Merge topic 'fetchcontent-externalproject-empty-args'Craig Scott2020-05-252-91/+163
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dca6bd04b FetchContent: Preserve empty string arguments cbf2daeed0 ExternalProject: Preserve empty string arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4729
| * | | | | FetchContent: Preserve empty string argumentsCraig Scott2020-05-231-21/+41
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20579
| * | | | | ExternalProject: Preserve empty string argumentsCraig Scott2020-05-231-70/+122
| |/ / / /
* | | | | Merge topic 'CheckLinkerFlag-module'Brad King2020-05-251-0/+81
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af96c0f4fa CheckLinkerFlag: Add module to check validity of linker flags 3c4cc77d55 Tests: Extend Fortran compiler information Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4777
generated by cgit v0.12 at 2025-01-05 02:36:27 (GMT)