summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindCUDAToolkit-target-guards'Brad King2020-01-291-45/+28
|\ | | | | | | | | | | | | | | 916d54dfb3 FindCUDAToolkit: Fix behavior on multiple calls b452e2bd6a FindCUDAToolkit: Fix CUDA::* target guard logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4293
| * FindCUDAToolkit: Fix behavior on multiple callsRodolfo Lima2020-01-281-41/+22
| | | | | | | | | | | | | | | | | | Update `_CUDAToolkit_find_and_add_import_lib` to create and add dependencies to a target in one step that shared a single guard against repeated definitions. Otherwise we were adding dependencies again on every call. Fixes: #20282
| * FindCUDAToolkit: Fix CUDA::* target guard logicRodolfo Lima2020-01-281-4/+6
| | | | | | | | Issue: #20282
* | Merge topic 'fortran-subdir-simplify'Brad King2020-01-291-9/+1
|\ \ | | | | | | | | | | | | | | | | | | a7b844d6d4 CMakeAddFortranSubdirectory: Simplfy logic to always build subdir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4296
| * | CMakeAddFortranSubdirectory: Simplfy logic to always build subdirBrad King2020-01-281-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | In the case that we use ExternalProject_Add to drive the subdirectory build, replace the `forcebuild` step with the official `BUILD_ALWAYS` option. Issue: #20179
* | | Merge topic 'blas-intel-mkl'Brad King2020-01-292-121/+232
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d7c69208e Find{BLAS,LAPACK}: Search always in dynamic linker paths fde5fcbc71 Find{BLAS,LAPACK}: Avoid repeated setting of prefered library suffixes fd1d4b823f Find{BLAS,LAPACK}: Fixed incorrect static library suffix for Apple c60c847510 Find{BLAS,LAPACK}: Added support for MKL single dynamic library 59dbff6daa Find{BLAS,LAPACK}: Added support for static MKL required linker flags 6bd9cee638 Find{BLAS,LAPACK}: Fixed detection of MKL, and several MKL improvements Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4246
| * | Find{BLAS,LAPACK}: Search always in dynamic linker pathsMario Emmenlauer2020-01-282-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the search in the dynamic linker paths 'LIB', 'LD_LIBRARY_PATH' and 'DYLD_LIBRARY_PATH' was dependent on the value of the environment variable 'MKLROOT'. If MKLROOT was given, the dynamic linker paths where not searched. This seems slightly counter-intuitive. This PR changes the behavior so that MKLROOT is searched first, but if unsuccesful, the dynamic linker paths are tried as well.
| * | Find{BLAS,LAPACK}: Avoid repeated setting of prefered library suffixesMario Emmenlauer2020-01-282-28/+28
| | |
| * | Find{BLAS,LAPACK}: Fixed incorrect static library suffix for AppleMario Emmenlauer2020-01-282-6/+0
| | |
| * | Find{BLAS,LAPACK}: Added support for MKL single dynamic libraryMario Emmenlauer2020-01-282-0/+8
| | |
| * | Find{BLAS,LAPACK}: Added support for static MKL required linker flagsMario Emmenlauer2020-01-282-67/+75
| | |
| * | Find{BLAS,LAPACK}: Fixed detection of MKL, and several MKL improvementsMario Emmenlauer2020-01-282-50/+155
| | |
* | | Merge topic 'FindBoost-delay-helper-targets'Brad King2020-01-281-37/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0e87b9d70 FindBoost: Do not add any Boost targets until after Boost found Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alexander Grund <github@grundis.de> Merge-request: !4280
| * | | FindBoost: Do not add any Boost targets until after Boost foundNiall Murphy2020-01-271-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move creation of the "helper" targets that do not require anything to be found to be done only after Boost is found. Fixes: #20261
* | | | Merge topic 'clang-tidy-driver-mode'Brad King2020-01-286-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6f4eb0907 clang-tidy: Add driver mode argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4208
| * | | | clang-tidy: Add driver mode argumentHanjiang Yu2020-01-276-0/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | `clang-tidy` does not infer driver mode if it is not provided with a JSON compilation database. This is exactly the way cmake launches it. Hence clang-tidy will only use the default driver mode. Add an explicit driver mode argument to avoid this.
* | | | Merge topic 'QNX_CMAKE_SYSROOT'Brad King2020-01-282-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32a6ab1f3b QNX: Add support for CMAKE_SYSROOT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4277
| * | | | QNX: Add support for CMAKE_SYSROOTStephen Kelly2020-01-272-0/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCC is a wrapper around GCC, but it is not a fully transparent wrapper. Some compile options need to be passed to GCC using a `-Wc` option. QCC does not support --sysroot, so setting CMAKE_SYSROOT in a toolchain file currently does not work. This means that it is likely that no one is setting CMAKE_SYSROOT in existing QNC toolchain files. Override the GCC option for sysroot in the QCC.cmake file with -Wc,-isysroot. This exposes a further issue in that the QNX SDK does not follow the same architectural folder structure as linux uses. That is, on linux systems, architecture-specific libraries might be in <sysroot>/usr/lib/<arch> such as /usr/lib/x86_64-linux-gnu/libcurl.so CMake models this by suffixing the <arch> onto lib directories when searching for libraries. The QNX SDK is structured differently such that the <arch> should be used as a prefix: <sysroot>/<arch>/usr/lib such as <sysroot>/x86_64/usr/lib/libcurl.so Add a variable for platform configuration to set whether to prefix or suffix the <arch> and set that in the QCC.cmake. Use the directory structure of the QNX SDK to compute the <arch> from the implicit library directories. The assumption is that the arch will be a single directory directly below the CMAKE_SYSROOT, below which the usr/ prefix occurs. It would not be appropriate to instruct users to make the <arch> part of the sysroot when specified in the toolchain file because: 1. That would be non-DRY - The QCC wrapper already determines the <arch> by the -V argument passed to the compiler, specified in the toolchain file as the CMAKE_C_COMPILER_TARGET variable. 2. The includes in the QNX SDK are not below the <arch> directory. So, the location of the <arch> in the full path is different on QNX compared to, say an embedded linux platform, but the intent is the same. Add documentation to recommend the use of CMAKE_SYSROOT in a QNX toolchain file. As the CMAKE_SYSROOT is always the same for QNX, it would be possible to simply set it in QCC.cmake. However, that would change behavior for existing users as when CMAKE_SYSROOT is set, files/paths outside of the CMAKE_SYSROOT do not get found. The <arch> prefixing is only enabled in cmSearchPath.cxx if CMAKE_SYSROOT is set. This ensures that the user gets consistency in the current state without CMAKE_SYSROOT, and gets better consistency when using CMAKE_SYSROOT.
* | | | Merge topic 'cuda_runtime_library_controls'Brad King2020-01-283-0/+21
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 0d0145138f CUDA: Add abstraction for cuda runtime selection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4178
| * | | CUDA: Add abstraction for cuda runtime selectionRobert Maynard2020-01-273-0/+21
| |/ / | | | | | | | | | | | | Fixes #17559 Replace our hard-coded default of cudart=static with a first-class abstraction to select the runtime library from an enumeration of logical names.
* | | Merge topic 'findCUDAToolkit_better_find_root_support'Brad King2020-01-281-31/+43
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 45d21dd5d4 CUDAToolkit: Use CMAKE_FIND_ROOT_PATH for all sdk lib searches e357772f20 CUDAToolkit: Use HINTS as it has higher precedence for searches c6ec51c625 CUDAToolkit: functions names now use CMake's reserved namespace Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4278
| * | CUDAToolkit: Use CMAKE_FIND_ROOT_PATH for all sdk lib searchesRobert Maynard2020-01-271-6/+18
| | |
| * | CUDAToolkit: Use HINTS as it has higher precedence for searchesRobert Maynard2020-01-241-1/+1
| | |
| * | CUDAToolkit: functions names now use CMake's reserved namespaceRobert Maynard2020-01-241-24/+24
| |/
* | Merge topic 'check-language-make-program'Brad King2020-01-271-0/+6
|\ \ | | | | | | | | | | | | | | | | | | 9d0f61839b CheckLanguage: Pass CMAKE_MAKE_PROGRAM to child process Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4272
| * | CheckLanguage: Pass CMAKE_MAKE_PROGRAM to child processKyle Edwards2020-01-241-0/+6
| |/ | | | | | | Fixes: #20017
* | Merge topic 'FindGTest-upstream-lib-names'Brad King2020-01-271-0/+11
|\ \ | | | | | | | | | | | | | | | | | | fbd3ea2047 FindGTest: Add GTest::{gtest,gtest_main} library names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4268
| * | FindGTest: Add GTest::{gtest,gtest_main} library namesPaweł Bylica2020-01-241-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces 2 new INTERFACE IMPORTED libraries: GTest::gtest and GTest::gtest_main. They link to GTest::GTest and GTest::Main targets respectively, therefore working as aliases. These new names map the names of the targets from upstream GTest's CMake package config. Fixes: #20255
* | | Merge topic 'cpack-deb-fix-description'Brad King2020-01-272-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | baec299ecd CPack: Fix regression in Deb description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4271
| * | | CPack: Fix regression in Deb descriptionKyle Edwards2020-01-242-2/+4
| | | | | | | | | | | | | | | | Fixes: #20254
* | | | Merge topic 'Qt4Macros-last-ext'Craig Scott2020-01-251-5/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | fd83dab339 Qt4Macros: Only cut last extension (".ts") and replace it with ".qm" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4211
| * | | Qt4Macros: Only cut last extension (".ts") and replace it with ".qm"Kai Blaschke2020-01-231-5/+7
| | | |
* | | | Merge topic 'findCUDAToolkit_support_cross_compilation'Brad King2020-01-241-5/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48bd2e0630 CUDAToolkit: Make sure to also search 'stubs' directory 69fcad9332 CUDAToolkit: Add support for cross-compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4253
| * | | | CUDAToolkit: Make sure to also search 'stubs' directoryRobert Maynard2020-01-231-2/+2
| | | | | | | | | | | | | | | | | | | | Fixes #20252
| * | | | CUDAToolkit: Add support for cross-compilingRobert Maynard2020-01-231-3/+43
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | CUDAToolkit now searches the correct targets folder based on what platform we are cross-compiling for. Fixes: #20232
* | | | Merge topic 'fphsa-no-regexp'Brad King2020-01-241-2/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 31144f85af FPHSA: Check _FOUND var name with STREQUAL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4266
| * | | FPHSA: Check _FOUND var name with STREQUALFeRD (Frank Dana)2020-01-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Using MATCHES "^${_Name}_FOUND$" limits the name of the found variable, since it can't contain any regular expression special-chars (period, plus sign, etc.)
* | | | Merge topic 'findmpi-documentation'Brad King2020-01-231-5/+17
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 95a501addb Help: Add more variable documentation to FindMPI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4263
| * | | Help: Add more variable documentation to FindMPIKyle Edwards2020-01-221-5/+17
| | | |
| * | | Merge topic 'msvc-runtime-library-masm' into release-3.16Brad King2020-01-221-0/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1421005835 ASM_MASM: Populate MSVC runtime library abstraction table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4257
| * \ \ \ Merge topic 'InstallRequiredSystemLibraries-redist' into release-3.16Brad King2020-01-211-6/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ca923bcaf IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Andrey Vihrov <andrey.vihrov@gmail.com> Merge-request: !4247
| * \ \ \ \ Merge topic 'findopenssl-dependencies-link-order' into release-3.16Brad King2020-01-171-7/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2880aaa06 FindOpenSSL: Fix ordering of dependency link flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4235
| | * | | | | FindOpenSSL: Fix ordering of dependency link flagsAshley Whetter2020-01-161-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20082, #20224
| * | | | | | Merge topic 'nag-submodule' into release-3.16Brad King2020-01-161-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7f60ddcf9 Fortran: Add support for NAG Fortran submodules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4229
| * \ \ \ \ \ \ Merge topic 'python39' into release-3.16Brad King2020-01-153-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6474214b3 FindPython: Add support for version 3.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Marc Chevrier <marc.chevrier@gmail.com> Acked-by: Björn Esser <besser82@fedoraproject.org> Merge-request: !4225
| * \ \ \ \ \ \ \ Merge topic 'FindMatlab-r2019' into release-3.16Brad King2020-01-141-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edb6fe3b6a FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPING Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4207
| * \ \ \ \ \ \ \ \ Merge topic 'FindMatlab-only-CXX' into release-3.16Brad King2020-01-141-4/+13
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b704d58f41 FindMatlab: in matlab_add_mex use the correct version file Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Patrik Huber <patrikhuber@gmail.com> Merge-request: !4206
| * \ \ \ \ \ \ \ \ \ Merge topic 'fix-cpack-deb-description-file' into release-3.16Brad King2020-01-132-3/+12
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d491f34a5e CPack: Fix regression in DEB generator description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4204
| * \ \ \ \ \ \ \ \ \ \ Merge topic 'objc-visibility-inlines' into release-3.16Brad King2020-01-133-7/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4199
* | \ \ \ \ \ \ \ \ \ \ \ Merge topic 'blas-lapack-whitespace'Brad King2020-01-232-526/+536
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beb2bbd5b5 Find{BLAS,LAPACK}: Cleanup whitespace, style, and comments 972c2cc7ca FindLAPACK: Fixed order of arguments for internal helper macro 7346a3226f Find{BLAS,LAPACK}: Clarify names of internal helper macro Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4243
generated by cgit v0.12 at 2024-09-22 01:38:32 (GMT)