summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | CheckLinkerFlag: Add module to check validity of linker flagsMarc Chevrier2020-05-251-0/+81
| |/ / / / | | | | | | | | | | | | | | | Fixes: #15934
* | | | | Merge topic 'ep-git-update-strategy'Brad King2020-05-252-165/+261
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0aea435aa1 ExternalProject: Provide choice of git update strategies ea410414c5 ExternalProject: factor out gitupdate step to separate file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4239
| * | | | | ExternalProject: Provide choice of git update strategiesCraig Scott2020-05-232-11/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16528 Co-Authored-By: Michael Wake <macwake@gmail.com>
| * | | | | ExternalProject: factor out gitupdate step to separate fileCraig Scott2020-05-232-163/+170
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refactoring exposed that the original implementation was referring to an undefined variable src_name, which was previously only used in error messages. This has been fixed as part of the refactoring work. Fixes: #20336
* | | | | Merge topic 'FindSquish_settingsgroup_removal'Brad King2020-05-254-16/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8492ac1363 FindSquish: Remove settingsGroup argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4763
| * | | | | FindSquish: Remove settingsGroup argumentFrederik Gladhorn2020-05-194-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This argument never worked and was not passed on Windows, which is why the Windows version needs fewer fixups (and used to work independent of this change). On Linux (and macOS) it was passed and prevented the server from starting and the test would not be able to run. See also comments on https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4648
* | | | | | Merge topic 'cuda-runtime-cleanup'Brad King2020-05-252-29/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcb44ac2ee CUDA: Simplify Clang implicit host linker settings 23519dd24f CUDA: Fix implicit runtime library filtering on Windows 16bed00712 CUDA: Refactor implicit library filtering 5c7ca6f8a8 CUDA: Move VS CudaRuntime selection to be with rest of CUDA options 4468acb979 CUDA: Factor runtime library lookup into helper method Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4776
| * | | | | CUDA: Simplify Clang implicit host linker settingsBrad King2020-05-221-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of `CMAKE_CUDA_HOST_IMPLICIT_LINK_*` is to capture the extra link libraries and directories that the CUDA compiler passes when invoking the host linker. We need this when using NVCC because CMake drives the host linker directly rather than through NVCC. However, this is not needed with Clang because: * Clang does not pass any CUDA libraries automatically. * We drive linking with the Clang compiler anyway. Drop the detection logic for Clang because it only gives the normal C++ runtime libraries which we do not need here.
| * | | | | CUDA: Fix implicit runtime library filtering on WindowsBrad King2020-05-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CUDA runtime library names may have a `.lib` suffix. Exclude those too.
| * | | | | CUDA: Refactor implicit library filteringBrad King2020-05-222-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES just after it is computed. Re-use the same exclusion list for filtering CMAKE_CUDA_IMPLICIT_LINK_LIBRARIES to avoid duplication.
* | | | | | Merge topic 'fortran-preprocess-property'Brad King2020-05-2212-0/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3888de23da Ninja: Skip Fortran preprocessing if Fortran_PREPROCESS is OFF 66c4e87282 Ninja: Add helper functions to generate Fortran build 5cca1ec893 Ninja: Add helper functions to generate Fortran preprocess rule b0a6161190 Fortran: Add Fortran_PREPROCESS property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4659
| * | | | | | Fortran: Add Fortran_PREPROCESS propertyPeter Hill2020-05-2112-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #18870
* | | | | | | Merge topic 'support_conda_env'Brad King2020-05-221-0/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50879ce412 Conda: Add CONDA_PREFIX as an acceptable system prefix path cd9c3c000f Tests: Update QtAutogen codeeditor test only include headers needed d806bd2e8c Tests: Update test suite to run in an Anaconda environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4773
| * | | | | | Conda: Add CONDA_PREFIX as an acceptable system prefix pathRobert Maynard2020-05-211-0/+4
| | | | | | |
* | | | | | | Merge topic 'cuda-default-runtime'Brad King2020-05-225-3/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8eee80e30 Merge branch 'backport-cuda-default-runtime' into cuda-default-runtime 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
| * \ \ \ \ \ \ Merge branch 'backport-cuda-default-runtime' into cuda-default-runtimeBrad King2020-05-225-3/+35
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
generated by cgit v0.12 at 2024-09-23 20:28:21 (GMT)