summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'pch-no-Fortran' into release-3.17Brad King2020-06-032-11/+15
|\ | | | | | | | | | | | | 10c88c4337 PCH: Do not enable GNU or Intel PCH settings for Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4843
| * 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
* | 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
| * 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
* | 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
| * | CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchainRobert Maynard2020-05-215-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0d0145138f (CUDA: Add abstraction for cuda runtime selection, 2019-11-29, v3.17.0-rc1~83^2) we add CUDA runtime library selection flags by default. To maintain backwards compatibility the default CUDA runtime library needs to be computed based on what libraries are found on the initial compiler invocation. For example a toolchain could establish initial flags that have all CUDA compilations using the runtime version, and if we don't detect this we will try to link to both the static and shared runtime. Co-Author: Brad King <brad.king@kitware.com> Fixes: #20708
* | | FindPython: use CMAKE specific variables to look-up debug libraryMarc Chevrier2020-05-181-2/+8
|/ / | | | | | | Fixes: #20714
* | 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
| * | | 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 '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
| * | | 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 '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
| * | | 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
* | | 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
| * | | 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
* | | 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
| * | | FindBoost: Update MinGW compiler tag for Boost 1.73Brad King2020-05-041-1/+5
| | |/ | |/| | | | | | | | | | | | | | | | Boost 1.73 on MinGW no longer uses the compiler minor version in its library names if the major version is at least 5. Fixes: #20673
* | | 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
| * | | FindBoost: Add 1.73 to known versionsBoris Basic2020-05-041-1/+1
| |/ / | | | | | | | | | | | | This was accidentally left out of commit 9daf79c53b (FindBoost: Add support for Boost 1.73, 2020-04-19, v3.17.2~9^2).
* | | FindPython: fix error on FPHSA callMarc Chevrier2020-04-291-7/+7
|/ / | | | | | | Fixes: #20650
* | Merge topic 'FindBoost-1.73' into release-3.17Brad King2020-04-281-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 69ed51960b FindBoost: Prevent warning with boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4662
| * | FindBoost: Prevent warning with boost 1.73Orgad Shaneh2020-04-271-1/+1
| | | | | | | | | | | | | | | In commit 9daf79c53b (FindBoost: Add support for Boost 1.73, 2020-04-19) we forgot to update the version comparison for the warning.
* | | FindPython: fix reason failure propagationMarc Chevrier2020-04-241-21/+23
| | |
* | | FindPython: fix python compiler validationMarc Chevrier2020-04-231-15/+16
|/ / | | | | | | | | | | | | Ensure also the cache of properties is erased in case of multiple searches. Fixes: #20626, #20627
* | Merge topic 'FindBoost-1.73' into release-3.17Brad King2020-04-211-312/+329
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 9daf79c53b FindBoost: Add support for Boost 1.73 f48051d33f FindBoost: Simplify Boost_VERSION_STRING comparisons 56b3375f3e BoostScanDeps: Fix typo in numpy handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4635
| * | FindBoost: Add support for Boost 1.73Alexander Grund2020-04-201-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.73.0 sources to compute dependencies. This includes a new Boost.Nowide library. Special case: Boost.Filesystem is an optional dependency as the include is only required to make Boost.Filesystem use UTF-8 paths on user request
| * | FindBoost: Simplify Boost_VERSION_STRING comparisonsAlexander Grund2020-04-201-312/+314
| | |
* | | Merge topic 'ios_multi_arch_fix' into release-3.17Brad King2020-04-171-11/+76
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 170e598add iOS: Fix detection of supported SDK architectures Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alexander Köplinger <alex.koeplinger@outlook.com> Merge-request: !4615
| * | | iOS: Fix detection of supported SDK architecturesAlexandru Croitor2020-04-161-11/+76
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of relying on SDKSettings.plist which does not contain the certain architectures, deduce the supported architectures by inspecting libSystem.tbd and libSystem.dylib. .tbd files are text files, so just parse out the archs string. .dylib files can be fat or non-fat, so use lipo -info to extract the architectures and parse lipo output. Fixes: #20588
* | | Merge topic 'FindPython-if-auto-deref' into release-3.17Brad King2020-04-151-9/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 894fdea2a9 FindPython: remove extra dereference 0b9c9e2c8c FindPython: avoid autoderef in version comparisons Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4610
| * | | FindPython: remove extra dereferenceBen Boeckel2020-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | If the version is not found (e.g., missing headers), this causes a CMake error about `if(blah VERSION_EQUAL)` being an invalid statement.
| * | | FindPython: avoid autoderef in version comparisonsBen Boeckel2020-04-141-8/+8
| |/ /
* | | Merge topic 'FindCUDAToolkit-search-stubs' into release-3.17Brad King2020-04-151-2/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4f1e24efa0 FindCUDAToolkit searches stub location last Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4589
| * | | FindCUDAToolkit searches stub location lastRobert Maynard2020-04-141-2/+20
| | | | | | | | | | | | | | | | Fixes #20252
* | | | Merge topic 'FindMPI-pgi-spectrum-mpi-wrappers' into release-3.17Brad King2020-04-131-3/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | cd449c6175 FindMPI: Add the pgi compiler wrapper names used by IBM Spectrum MPI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4598
| * | | FindMPI: Add the pgi compiler wrapper names used by IBM Spectrum MPIChuck Atkins2020-04-101-3/+3
| | |/ | |/|
| * | Merge branch 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.16Brad King2020-04-011-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !4557
* | | | Apple: Improve handling of missing SDKs in CMAKE_APPLE_ARCH_SYSROOTSBrad King2020-04-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `<arch>-SDK-NOTFOUND` instead of an empty string as a placeholder in `CMAKE_APPLE_ARCH_SYSROOTS` for architectures whose SDK is not found. This ensures the length of `CMAKE_APPLE_ARCH_SYSROOTS` matches the length of `CMAKE_OSX_ARCHITECTURES`. It also makes the missing SDKs more visible in the value. Issue: #20534
* | | | Merge topic 'llvm-rc-include-path' into release-3.17Brad King2020-04-072-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35a29ec827 llvm-rc: Restore include path for data after explicit preprocessing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4570
| * | | | llvm-rc: Restore include path for data after explicit preprocessingThomas Bernard2020-04-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 1c2d031cbd (Add -E cmake_llvm_rc to preprocess files for llvm-rc, 2020-01-14, v3.17.0-rc1~24^2) with llvm-rc we explicitly preprocess RC source files and then compile separately without -I flags. This broke cases where the RC source references data files adjacent to itself or in the include path. This change adds the expansion of the include paths when calling the llvm-rc in order for the resource files to be picked up correctly by llvm-rc. Since the RC compiled file is first preprocessed, the file being compiled by llvm-rc resides in the build directory. In order for llvm-rc to find the resource data specified relative to the .rc file being compiled, the source file path is preppended in the include list so that the original source path takes priority over all the other includes paths specified. A space was added in the CMAKE_INCLUDE_FLAG_RC to make the include directive work properly for llvm-rc. Checks on the rc.exe showed that the syntax change doesn't affect it's proper operation. Fixes: #20529
* | | | | Merge topic 'ExternalProject-no-extract-bool' into release-3.17Brad King2020-04-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c4bb705e8 ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4562
| * | | | | ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF`Ben Boeckel2020-04-021-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes: #20531