summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* CUDA: Add support for Clang compilerRaul Tambre2020-05-157-22/+110
| | | | | | | | | | | | | | | | | | | When crosscompiling we pass the sysroot. We need to try various architecture flags. Clang doesn't automatically select one that works. First try the ones that are more likely to work for modern installations: * <=sm_50 is deprecated since CUDA 10.2, try sm_52 first for future compatibility. * <=sm_20 is removed since CUDA 9.0, try sm_30. Otherwise fallback to Clang's current default. Currently that's `sm_20`, the lowest it supports. Separable compilation isn't supported yet. Fixes: #16586
* FindCUDAToolkit: Factor out discovery code into a separate fileRaul Tambre2020-05-152-218/+233
| | | | | | This allows for re-use in other parts of the code, that require the CUDA toolkit location, but can't or may not want to use the full `FindCUDAToolkit`.
* CUDA: Remove toolkit include dirs from implicit include dirs only with NVIDIABrad King2020-05-151-10/+12
| | | | | | | | | | The special case added by commit 87df637078 (CUDA: Do not treat CUDA toolkit include directories as implicit, 2020-02-02, v3.17.0-rc1~31^2) breaks CMake's protections against changing the compiler's implicit include directory order. Do this only for the NVIDIA compiler where it is needed as a workaround to another problem. That compiler does not put the host compiler's implicit include directories in `-I` paths so we do not detect them as `CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES` anyway.
* Merge topic 'objc-env-vars'Brad King2020-05-152-18/+24
|\ | | | | | | | | | | | | | | | | | | 13ea190725 Help: Add 3.17.3 release note for Objective C/C++ compiler selection 16bf978e0c Merge branch 'backport-3.16-objc-env-vars' into objc-env-vars 67b9f55d46 Objective C/C++: Honor CC and CXX env vars to select compiler ab9be6662f Help: Document OBJC and OBJCXX env vars for Objective C/C++ compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4746
| * Merge branch 'backport-3.16-objc-env-vars' into objc-env-varsBrad King2020-05-142-18/+24
| |\
| | * Objective C/C++: Honor CC and CXX env vars to select compilerBrad King2020-05-142-18/+24
| | | | | | | | | | | | | | | | | | | | | If the `OBJC` or `OBJCXX` environment variable is not set to specify an Objective C or C++ compiler, check `CC` or `CXX` too. Fixes: #20703
| * | Merge topic 'fix-cache-args-file-to-dep-list' into release-3.17Brad King2020-05-131-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 0199dd9f1b ExternalProject: expose _ep_cache_args_script to the caller Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4710
| * \ \ Merge topic 'pch-msvc-pragma' into release-3.17Brad King2020-05-121-7/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4736
| * \ \ \ Merge topic 'FindGTK2-harfbuzz-target' into release-3.17Brad King2020-05-111-3/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ab137b7e9 FindGTK2: Add harfbuzz target for dependency from pango Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4725
| * | | | | FindPython: ensure any specified version is correctly handledMarc Chevrier2020-05-071-43/+73
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20674
| * | | | | Merge topic 'FindPkgConfig-isystem' into release-3.17Brad King2020-05-061-8/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9d93c3731 Help: Add 3.17 release note for FindPkgConfig '-isystem' fix dfaaae67a3 Merge branch 'backport-3.16-FindPkgConfig-isystem' 4d446c68d1 FindPkgConfig: also handle "-isystem" prefixes for include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4693
| | * \ \ \ \ Merge branch 'backport-3.16-FindPkgConfig-isystem'Brad King2020-05-061-8/+42
| | |\ \ \ \ \
| | | * | | | | FindPkgConfig: also handle "-isystem" prefixes for include directoriesRolf Eike Beer2020-05-051-8/+42
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | Fixes: #20652
| * | | | | | Merge topic 'CheckLanguage-cuda-host' into release-3.17Brad King2020-05-061-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b304a7503 CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILER Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4711
| * \ \ \ \ \ \ Merge topic 'FindBoost-1.73' into release-3.17Brad King2020-05-051-1/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1e04be913 FindBoost: Update MinGW compiler tag for Boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Boris Basic <baljci@hotmail.com> Merge-request: !4706
| * \ \ \ \ \ \ \ Merge topic 'FindBoost-1.73' into release-3.17Brad King2020-05-051-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e8d66f431 FindBoost: Add 1.73 to known versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4708
| * | | | | | | | | FindPython: fix error on FPHSA callMarc Chevrier2020-04-291-7/+7
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20650
* | | | | | | | | Merge topic 'FindSquish-add_test'Brad King2020-05-151-30/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2137384202 FindSquish: Make squish_add_test work with any Squish version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4648
| * | | | | | | | | FindSquish: Make squish_add_test work with any Squish versionFrederik Gladhorn2020-05-131-30/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the documentation (Squish 4 is from 2010, so people are likely using something newer) and let squish_add_test call either the v3 or v4 macro based on the detected Squish version. This cannot break things, since mixing incompatible versions would not have worked before.
* | | | | | | | | | Merge topic 'squish_windows_ext'Brad King2020-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c587b8d026 FindSquish: Fix target app name on windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4742
| * | | | | | | | | | FindSquish: Fix target app name on windowsFrederik Gladhorn2020-05-131-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows has .exe in the target name, but Squish only uses the name without extension which makes things a lot easier when running tests on several platforms. Discovered when coming back to Windows and doing a fresh build and suddenly the binary to be tested was no longer found due to the name mismatch.
* | | | | | | | | | Merge topic 'fix-cache-args-file-to-dep-list'Brad King2020-05-131-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0199dd9f1b ExternalProject: expose _ep_cache_args_script to the caller Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4710
| * | | | | | | | | ExternalProject: expose _ep_cache_args_script to the callerBen Boeckel2020-05-121-0/+4
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed so that the caller can add a dependency on the cache file. Fixes: #20668
* | | | | | | | | Merge topic 'conditional-CMAKE_EXPORT_COMPILE_COMMANDS'Brad King2020-05-131-7/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe19df49d4 Initialize CMAKE_EXPORT_COMPILE_COMMANDS only if not set already Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4738
| * | | | | | | | | Initialize CMAKE_EXPORT_COMPILE_COMMANDS only if not set alreadyBrad King2020-05-121-7/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also de-duplicate its initialization code. Fixes: #16588
* | | | | | | | | Merge topic 'FindPython-IronPython-support'Brad King2020-05-134-85/+382
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8ffc60220 FindPython: Add IronPython support on all platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4730
| * | | | | | | | FindPython: Add IronPython support on all platformsMarc Chevrier2020-05-114-85/+382
| | | | | | | | |
* | | | | | | | | Merge topic 'pch-msvc-pragma'Brad King2020-05-121-7/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4736
| * | | | | | | | MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and aboveBrad King2020-05-111-7/+5
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 15.6 introduced support for this pragma. Older MSVC versions warn that it is unknown. Fixes: #20692
* | | | | | | | Merge topic 'doxygen-generated-sources'Brad King2020-05-111-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ec9690802 FindDoxygen: Allow generated files with USE_STAMP_FILE 683abe4366 FindDoxygen: Formatting-only indentation cleanup for test case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4726
| * | | | | | | | FindDoxygen: Allow generated files with USE_STAMP_FILECraig Scott2020-05-091-3/+5
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20597
* | | | | | | | Merge topic 'FindGTK2-harfbuzz-target'Brad King2020-05-111-3/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 5ab137b7e9 FindGTK2: Add harfbuzz target for dependency from pango Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4725
| * | | | | | FindGTK2: Add harfbuzz target for dependency from pangoBrad King2020-05-091-3/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit effafca77e (FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS, 2019-10-01, v3.16.0-rc1~22^2), pango's dependency on harfbuzz has been captured, but only for the `GTK2_INCLUDE_DIRS` and `GTK2_LIBRARIES` variables. Add the `GTK2::harfbuzz` imported target and update the `GTK2::pango` target to depend on it. Issue: #19531
* | | | | | Merge topic 'FindPython-check-specified-version'Brad King2020-05-081-47/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71229f2c85 Merge branch 'backport-3.17-FindPython-check-specified-version' into FindPython-check-specified-version e1c869906c FindPython: ensure any specified version is correctly handled 25978c7a00 FindPython: ensure any specified version is correctly handled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4718
| * | | | | | FindPython: ensure any specified version is correctly handledMarc Chevrier2020-05-071-47/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20674
* | | | | | | Merge topic 'ow-mult-platforms'Brad King2020-05-0710-6/+119
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4adfd2a3aa OpenWatcom: Add cross-compilation support for Windows 43c3243c2d OpenWatcom: Fix Linux support file d26eea220a OpenWatcom: Add OS/2 target support 0ab583d787 OpenWatcom: Add DOS target support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4702
| * | | | | | | OpenWatcom: Add cross-compilation support for WindowsJiri Malak2020-05-061-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add system header files directories for cross-compilation
| * | | | | | | OpenWatcom: Fix Linux support fileJiri Malak2020-05-061-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CMAKE_SHARED_LINKER_FLAGS_INIT macro Fix executable file name for Linux to be without extension Add system header files directory for cross-compilation
| * | | | | | | OpenWatcom: Add OS/2 target supportJiri Malak2020-05-064-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OS/2 16-bit and 32-bit target support files for cross-compilation by OpenWatcom. It is used if CMAKE_SYSTEM_NAME=OS2 is defined. If CMAKE_SYSTEM_PROCESSOR=I86 is defined then 16-bit OS/2 target is used, otherwise 32-bit OS/2 target is used.
| * | | | | | | OpenWatcom: Add DOS target supportJiri Malak2020-05-064-0/+44
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DOS 16-bit and 32-bit target support files for cross-compilation by OpenWatcom. It is used if CMAKE_SYSTEM_NAME=DOS is defined. If CMAKE_SYSTEM_PROCESSOR=I86 is defined then 16-bit DOS target is used, otherwise 32-bit DOS target is used.
* | | | | | | Merge topic 'FindVulkan-use-SDK-env-variable'Brad King2020-05-071-8/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 590cde6125 FindVulkan: Prefer VULKAN_SDK env var before standard paths on UNIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4714
| * | | | | | | FindVulkan: Prefer VULKAN_SDK env var before standard paths on UNIXPatric Schmitz2020-05-061-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also document the variable. Fixes: #18346
* | | | | | | | Merge topic 'compiler-sysroot-slashes'Brad King2020-05-071-1/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e831e4a17 Windows: Normalize slashes in compiler -print-sysroot path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4715
| * | | | | | | Windows: Normalize slashes in compiler -print-sysroot pathBrad King2020-05-061-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 8cc384f629 (Compilers: Add paths from -print-sysroot to system prefix path, 2020-03-25) we detect the compiler `-print-sysroot` output and save it. On Windows, the value may include backslashes. Convert the path to CMake's forward-slash convention for storage. Fixes: #20679
* | | | | | | Merge topic 'gtest-space-in-parameter'Brad King2020-05-061-4/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 839a1010a3 GoogleTestAddTests: Fix output processing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4694
| * | | | | | | GoogleTestAddTests: Fix output processingStefan Floeren2020-05-051-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function gtest_discover_tests calls the passed test executable with the parameter --gtest_list_tests and parses the output to find all tests. In case of value-parameterized tests ([1]), the test values are included in the output. While test names are alphanumeric, the values can contain arbitrary content. First, the output is separated into lines with `foreach`. Included semi-colons breaks this and need to get escaped. Afterwards, the testname is passed on to the `add_command` helper. This helper was converted into a macro in commit dac201442d (GoogleTest: Optimize gtest_discover_tests, 2020-02-18). As a macro, its arguments are re-evaluated. Therefore we need to escape `\`, `;` and to prevent unwanted variable expansion `$`. Fixes: #20661 [1] <https://github.com/google/googletest/blob/0eea2e9/googletest/docs/advanced.md#value-parameterized-tests>
* | | | | | | | Merge topic 'FindPkgConfig-isystem'Brad King2020-05-061-7/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 502e562940 Merge branch 'backport-3.17-FindPkgConfig-isystem' into FindPkgConfig-isystem e9d93c3731 Help: Add 3.17 release note for FindPkgConfig '-isystem' fix dfaaae67a3 Merge branch 'backport-3.16-FindPkgConfig-isystem' cd31a8acef FindPkgConfig: also handle "-isystem" prefixes for include directories 4d446c68d1 FindPkgConfig: also handle "-isystem" prefixes for include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4693
| * | | | | | | | FindPkgConfig: also handle "-isystem" prefixes for include directoriesRolf Eike Beer2020-05-051-7/+41
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #20652
* | | | | | | | Merge topic 'CheckLanguage-cuda-host'Brad King2020-05-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 5b304a7503 CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILER Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4711
| * | | | | | CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILERBrad King2020-05-051-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the condition added by commit fada8cbfd6 (CheckLanguage: Report CMAKE_CUDA_HOST_COMPILER if needed for compilation, 2019-05-31, v3.15.0-rc1~12^2) to activate CUDA-specific logic. The old condition had worked in our test suite only by accident because the loop variable used in the test happened to be the name and value that the old condition used! Update the test to use a different name. Fixes: #19013
generated by cgit v0.12 at 2025-01-06 21:57:22 (GMT)