summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindTIFF-tiffxx'Brad King2020-07-011-6/+93
|\ | | | | | | | | | | | | a468cc431c FindTIFF: add component CXX to include the C++ wrapper libtiffxx Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4934
| * FindTIFF: add component CXX to include the C++ wrapper libtiffxxJoachim Wuttke (h)2020-06-291-6/+93
| | | | | | | | Fixes: #20860
* | Merge topic 'find_vulkan_glslc'Brad King2020-06-301-4/+26
|\ \ | | | | | | | | | | | | | | | | | | 467509d767 FindVulkan: Support for finding glslc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4944
| * | FindVulkan: Support for finding glslcRyan Kawicki2020-06-271-4/+26
| | | | | | | | | | | | | | | | | | | | | The GLSL SPIR-V compiler is part of the Vulkan SDK and may be used by projects for compiling shaders as part of the build process. This is not strictly required to build a Vulkan application, which is why the variable is not part of the REQUIRED_VARs for the module.
* | | Merge topic 'gtest-xml-output'Brad King2020-06-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 75aa3ee7e7 GoogleTest: Fix name generation for XML_OUTPUT_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4942
| * | | GoogleTest: Fix name generation for XML_OUTPUT_DIRStefan Floeren2020-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Google test framework allows to write the results into an XML file since commit e9ab39eb1d (GoogleTest: Add XML_OUTPUT_DIR parameter, 2020-03-06, v3.18.0-rc1~538^2~2). This file is passed on the command line: `--gtest_output=xml:FILE_NAME`. The module allows to specify a directory to save those files with **TEST_XML_OUTPUT_PARAM**. If the option is set, the filename will be set to `${prefix}${pretty_suite}.${pretty_test}${suffix}.xml`. The pretty names contain parameters for the tests, if value-parameterized tests are used. These parameters may not be safe to use in file names. There are two possible options: 1. sanitize the file name 2. omit the values and use the internal numbering of gtest This commit chose option 2. The testname needs to be a valid C++ identifier and should therefore be reasonable for a filename. Note that the generated names contain slashes. This will lead to subdirectories, but works on both Linux and Windows. Fixes: #20877
* | | | Merge topic 'intel-c++20'Brad King2020-06-291-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85b151ff5b Merge branch 'backport-intel-c++20' into intel-c++20 99c8dbf497 Intel: Add flags for C++20 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4946
| * \ \ \ Merge branch 'backport-intel-c++20' into intel-c++20Brad King2020-06-261-0/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Intel: Add flags for C++20Brad King2020-06-261-0/+10
| | |/ / | | | | | | | | | | | | | | | | Patch-by: Matheus Izvekov Fixes: #20880
* | | | Merge topic 'visual-studio-android'Brad King2020-06-266-9/+128
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6051a49c78 Visual Studio: Add Android support bbcaf9689e Refactor: Add IsAndroidGuiExecutable() method to cmTarget 14456923bd cmGlobalVisualStudio10Generator: Move variable initialization to header d5b5c19278 cmGlobalGenerator: FindMakeProgram() before CMakeDetermineSystem Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4898
| * | | | Visual Studio: Add Android supportKyle Edwards2020-06-246-9/+128
| | | | |
* | | | | Merge topic 'GoogleTest-DISCOVERY_MODE-cleanups'Brad King2020-06-261-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1458b4c048 Help: Add CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE to release notes 642ea49115 GoogleTest: Replace SEND_ERROR with FATAL_ERROR 09c38e8de6 Tests: Don't ask for things not required for GoogleTest Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4938
| * | | | GoogleTest: Replace SEND_ERROR with FATAL_ERRORCraig Scott2020-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | We want to fail and halt immediately upon any error, not continue past a fatal problem.
| * | | | Merge topic 'VxWorks-platform-id' into release-3.18Brad King2020-06-231-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b22586be01 VxWorks: Add Platform ID for Modules/CMakePlatformId.h.in Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4922
| * \ \ \ \ Merge topic 'fix-win-flex-bison' into release-3.18Brad King2020-06-232-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0faa2b9870 Find{FLEX,BISON}: Add 'win-' executable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4931
| * \ \ \ \ \ Merge topic 'FindCUDA-11' into release-3.18Brad King2020-06-231-2/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d9f2f9714 FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4929
| * \ \ \ \ \ \ Merge topic 'CUDAToolkit-cuda-11' into release-3.18Brad King2020-06-191-1/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b284a3c764 CudaToolkit: Update for new/removed libraries in CUDA 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4917
* | | | | | | | | Find{BLAS,LAPACK}: Add missing thread library for Intel MKL on Win32evatux2020-06-232-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch also updates the documentation to explicitly state that Intel10_32 stands for threaded case (linked with Intel OpenMP). Later, one may need to add Intel10_32_seq to support linking with the sequential version of Intel MKL. Fixes: #20857
* | | | | | | | | Merge topic 'VxWorks-platform-id'Brad King2020-06-231-0/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b22586be01 VxWorks: Add Platform ID for Modules/CMakePlatformId.h.in Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4922
| * | | | | | | | VxWorks: Add Platform ID for Modules/CMakePlatformId.h.inLihua Zhao2020-06-231-0/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge topic 'fix-win-flex-bison'Brad King2020-06-232-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0faa2b9870 Find{FLEX,BISON}: Add 'win-' executable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4931
| * | | | | | | Find{FLEX,BISON}: Add 'win-' executable namesYan2020-06-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Distributions of these tools on Windows now use a `win-` prefix instead of the previously-seen `win_` prefix. Search for both.
* | | | | | | | Merge topic 'FindCUDA-11'Brad King2020-06-231-2/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | 1d9f2f9714 FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4929
| * | | | | | FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11Robert Maynard2020-06-221-2/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nppicom library has been removed in preference of nvjpeg starting in CUDA 11. Fixes: #20845
* | | | | | Merge topic 'FindSDL-update'Brad King2020-06-191-23/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ffd2c70bf FindSDL: Add SDL_INCLUDE_DIRS, SDL_LIBRARIES, and SDL::SDL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4902
| * | | | | | FindSDL: Add SDL_INCLUDE_DIRS, SDL_LIBRARIES, and SDL::SDLFrédéric Simonis2020-06-181-23/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also provide `SDL_VERSION[_{MAJOR,MINOR,PATCH}]`. Fixes: #12911
* | | | | | | Merge topic 'CUDAToolkit-cuda-11'Brad King2020-06-191-1/+5
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b284a3c764 CudaToolkit: Update for new/removed libraries in CUDA 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4917
| * | | | | | CudaToolkit: Update for new/removed libraries in CUDA 11Robert Maynard2020-06-181-1/+5
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'cuda-toolkit-vs'Brad King2020-06-191-121/+130
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0280801f4 CUDA: Fix CMAKE_CUDA_COMPILER_TOOLKIT_ROOT detection in Visual Studio 90be0916b5 CUDA: Re-order some logic for determining the compiler 4ab5f109f0 CUDA: Remove unused variables while determining compiler 492e5f01fa CUDA: Simplify CMAKE_CUDA_COMPILER_TOOLKIT_ROOT computation 4785bd6153 CUDA: Skip the entire search for nvcc when it is CMAKE_CUDA_COMPILER Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4921
| * | | | | CUDA: Fix CMAKE_CUDA_COMPILER_TOOLKIT_ROOT detection in Visual StudioBrad King2020-06-181-108/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a Visual Studio generator, we do not know the path to `CMAKE_CUDA_COMPILER` until after the compiler id detection project extracts it. However, based on the VS toolchain configuration we know that the compiler id will be NVIDIA, so use that to drive the CUDA architecture flag logic. After the main compiler id step we know `CMAKE_CUDA_COMPILER`, so `CMAKE_CUDA_COMPILER_TOOLKIT_ROOT` can then be computed.
| * | | | | CUDA: Re-order some logic for determining the compilerBrad King2020-06-181-11/+9
| | | | | |
| * | | | | CUDA: Remove unused variables while determining compilerBrad King2020-06-181-2/+0
| | | | | |
| * | | | | CUDA: Simplify CMAKE_CUDA_COMPILER_TOOLKIT_ROOT computationBrad King2020-06-181-1/+1
| | | | | |
| * | | | | CUDA: Skip the entire search for nvcc when it is CMAKE_CUDA_COMPILERBrad King2020-06-181-80/+80
| | | | | |
* | | | | | Merge topic 'cuda_nvcc_exe_search'Brad King2020-06-191-7/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | | | | | d9c1f05924 CUDA: Fix NVCC executable search during compiler detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4920
| * | | | CUDA: Fix NVCC executable search during compiler detectionRaul Tambre2020-06-181-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The result variable was `CUDAToolkit_NVCC_EXECUTABLE` instead of `_CUDA_NVCC_EXECUTABLE`, which the rest of the code used. Also, we can simply `set()` the `_CUDA_NVCC_EXECUTABLE` value without searching. Fixes: #20847
| * | | | Merge topic 'doc-3.18-fixups' into release-3.18Brad King2020-06-181-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 947cfc732d Help: Explicitly say transaction, don't abbreviate to trans 90c73479bc Help: Correct and condense examples for VS_SOLUTION_DEPLOY 0420de10b5 Help: Add missing cross-referencing for generator expressions 013f7a2647 Help: Formatting, crossref for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG> a12d53acf3 Help: Add missing PCH_WARN_INVALID docs and related cleanups 95a16f7805 Help: Fix formatting error and consistency for gtest_discover_tests() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4915
* | \ \ \ \ Merge topic 'doc-3.18-fixups'Brad King2020-06-181-4/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 947cfc732d Help: Explicitly say transaction, don't abbreviate to trans 90c73479bc Help: Correct and condense examples for VS_SOLUTION_DEPLOY 0420de10b5 Help: Add missing cross-referencing for generator expressions 013f7a2647 Help: Formatting, crossref for FRAMEWORK_MULTI_CONFIG_POSTFIX_<CONFIG> a12d53acf3 Help: Add missing PCH_WARN_INVALID docs and related cleanups 95a16f7805 Help: Fix formatting error and consistency for gtest_discover_tests() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4915
| * | | | | Help: Fix formatting error and consistency for gtest_discover_tests()Craig Scott2020-06-181-4/+4
| | |/ / / | |/| | |
* | | | | Merge topic 'mkl-lib-dir'Brad King2020-06-182-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d5a07ce76 FindLAPACK: Extend search directories for MKL d880d2805f FindBLAS: Extend search directories for MKL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4905
| * | | | | FindLAPACK: Extend search directories for MKLevatux2020-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though Intel MKL typically puts the libraries under `$MKLROOT/lib/$arch_$os` some installations may still use `$MKLROOT/lib/$arch/` path. Ideally, `$arch` should be a symlink to `$arch_$os`, but sometimes the opposite happens (for instance, see Intel MKL distribution in Arch Linux [1]), and sometimes only `$arch` directory alone is present. This patch extends the search list with `$MKLROOT/lib/$arch` with lower priority than `$MKLROOT/lib/$arch_$os`, as the latter is the official path to Intel MKL libraries. It is also worth mentioning that Intel MKL Link Line Adviser [2] recommends using `$MKLROOT/lib/$arch` directory in a link line: ``` -L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl ``` [1] https://www.archlinux.org/packages/community/x86_64/intel-mkl/files/ [2] https://software.intel.com/content/www/us/en/develop/articles/intel-mkl-link-line-advisor.html
| * | | | | FindBLAS: Extend search directories for MKLevatux2020-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though Intel MKL typically puts the libraries under `$MKLROOT/lib/$arch_$os` some installations may still use `$MKLROOT/lib/$arch/` path. Ideally, `$arch` should be a symlink to `$arch_$os`, but sometimes the opposite happens (for instance, see Intel MKL distribution in Arch Linux [1]), and sometimes only `$arch` directory alone is present. This patch extends the search list with `$MKLROOT/lib/$arch` with lower priority than `$MKLROOT/lib/$arch_$os`, as the latter is the official path to Intel MKL libraries. It is also worth mentioning that Intel MKL Link Line Adviser [2] recommends using `$MKLROOT/lib/$arch` directory in a link line: ``` -L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl ``` [1] https://www.archlinux.org/packages/community/x86_64/intel-mkl/files/ [2] https://software.intel.com/content/www/us/en/develop/articles/intel-mkl-link-line-advisor.html
* | | | | | Merge topic 'armclang-typo'Brad King2020-06-181-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | | | | | | | | | | | | 2ff68c00e0 ARMClang: Fix typo in -Xlinker flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4916
| * | | | ARMClang: Fix typo in -Xlinker flagOsama Moharam2020-06-181-1/+1
| | |/ / | |/| | | | | | | | | | | | | | Fix a typo from commit ef816610be (ARMClang: allow fallback to -march and correct setting of --cpu flags, 2020-06-03, v3.18.0-rc1~18^2).
* | | | Merge topic 'cuda_clang_limitations'Brad King2020-06-171-0/+4
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | | | | | | | bdb105ee94 Help: Mention CUDA Clang limitations in 3.18 release notes fec7dd33d3 CUDA: Add issue number to Clang separable compilation error 14163d7d6b CUDA: Throw error for Clang on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4903
| * | CUDA: Throw error for Clang on WindowsRaul Tambre2020-06-161-0/+4
| | | | | | | | | | | | | | | | | | Supporting compiling on Windows is more complicated than initially expected, so it won't make it into CMake 3.18. Add a helpful error for users.
| * | Merge topic 'cuda_clang_toolkit_path' into release-3.18Brad King2020-06-154-260/+415
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec59fb6c31 CUDA: Determine CUDA toolkit location for NVCC 0a056246a1 CUDA: Pass toolkit path to Clang 9c43972127 FindCUDAToolkit: Avoid unnecessary temporary variable computing binary dir 9eebb5b8b2 FindCUDAToolkit: Remove unnecessary checks around searches 8f01fe7bf1 FindCUDAToolkit: Use list(SORT) to sort in natural order 8c144fe9ad FindCUDAToolkit: Compute CUDAToolkit_INCLUDE_DIR instead of searching 403f8d31e3 FindCUDAToolkit: Add CUDAToolkit_LIBRARY_ROOT 6636693134 FindCUDAToolkit: Re-unify with Internal/CUDAToolkit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4828
| * \ \ Merge topic 'cuda_architectures_disable' into release-3.18Brad King2020-06-151-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 877a92e968 CUDA: Add support for disabling CUDA_ARCHITECTURES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4886
* | \ \ \ Merge topic 'FindCurses-nodelay'Brad King2020-06-161-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3211e07dc6 FindCurses: Detect and satisfy dependency on tinfo for nodelay Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4892
| * | | | | FindCurses: Detect and satisfy dependency on tinfo for nodelayPaymon MARANDI2020-06-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the change from commit 1f646c6ce0 (FindCurses: Detect and satisfy ncurses dependency on tinfo, 2014-01-17, v3.0.0-rc5~6^2) to handle `nodelay` too.
generated by cgit v0.12 at 2025-02-05 13:17:39 (GMT)