summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindBLAS-OpenBLAS-thread'Brad King2019-12-131-2/+6
|\ | | | | | | | | | | | | d1e111d166 FindBLAS: Consider OpenBLAS with thread libraries only with C or CXX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4134
| * FindBLAS: Consider OpenBLAS with thread libraries only with C or CXXBrad King2019-12-121-2/+6
| | | | | | | | | | | | | | | | The check added by commit 276b56f01c (FindBLAS: Add second try for OpenBLAS with thread libraries., 2019-06-07, v3.15.0-rc2~5^2) can work only when C or CXX is enabled. Fixes: #20092
* | Merge topic 'backport-3.16-vs-v142-version'Brad King2019-12-131-3/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 2f853eec3d Merge branch 'backport-3.15-vs-v142-version' into backport-3.16-vs-v142-version d8d4924d98 VS: Fix support for v142 toolset minor versions in VS 16.5+ 07612646fe VS: Fix support for v142 toolset minor versions in VS 16.5+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4133
| * | VS: Fix support for v142 toolset minor versions in VS 16.5+Brad King2019-12-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 5117389931 (VS: Fix support for v142 toolset minor versions, 2019-10-01, v3.16.0-rc1~32^2) worked around a bug in VS's placement of toolset files. VS 16.5 will fix that bug and restore the original pattern for locations of toolset files. Update our logic to look for both possibilities. Issue: #19779
| * | Merge topic 'wxwidgets_macos_weakframework' into release-3.16Brad King2019-12-101-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4126
| * \ \ Merge topic 'FindThreads-lib-flag' into release-3.16Brad King2019-12-051-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7ffefea7c FindThreads: Restore hard-coded '-l' flag on library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4112
* | \ \ \ Merge topic 'function-var-current'Kyle Edwards2019-12-125-14/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24fdd51f45 Refactor: Replace CMAKE_CURRENT_LIST_DIR with CMAKE_CURRENT_FUNCTION_LIST_DIR 90e3e2a777 cmFunctionCommand: Introduce `CMAKE_CURRENT_FUNCTION*` variables dd54290dab Refactor: Modernize `function` command Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4000
| * | | | | Refactor: Replace CMAKE_CURRENT_LIST_DIR with CMAKE_CURRENT_FUNCTION_LIST_DIRAlex Turbov2019-12-105-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some modules define an intermediate global scope visible variables to access "resource" files from functions. Now these variables could be eliminated.
* | | | | | Merge topic 'add_cuda_meta_compiler_features'Brad King2019-12-127-7/+139
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2467a2b318 CUDA: Add cuda meta-features (e.g. ``cuda_std_11``) support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3992
| * | | | | | CUDA: Add cuda meta-features (e.g. ``cuda_std_11``) supportRobert Maynard2019-12-107-7/+139
| | | | | | |
* | | | | | | Merge topic 'FindThreads-tsan'Brad King2019-12-121-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b328cbaadb FindThreads: Add pthread_cancel to program to test for pthreads in libc Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Merge-request: !4056
| * | | | | | | FindThreads: Add pthread_cancel to program to test for pthreads in libcCristian Morales Vega2019-12-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using ThreadSanitizer our existing CMAKE_HAVE_LIBC_PTHREAD test program links using symbols from the tsan library. Among the symbols not provided by that library, `pthread_cancel()` seems to be the less risky symbol to add to the check. Fixes: #19981
* | | | | | | | Merge topic 'ctest-drmemory-support'Brad King2019-12-122-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 676befdf52 ctest: add support for memcheck using Dr. Memory 2db0a65f56 cmCTestMemCheckHandler.cxx: minor refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4119
| * | | | | | | | ctest: add support for memcheck using Dr. MemoryDietmar Scheidl2019-12-102-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19788
* | | | | | | | | Merge topic 'cpack-use-CPACK_PACKAGE_HOMEPAGE_URL'Kyle Edwards2019-12-113-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3476dbe6d7 CPack: CMAKE_PROJECT_HOMEPAGE_URL -> CPACK_PACKAGE_HOMEPAGE_URL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4024
| * | | | | | | | | CPack: CMAKE_PROJECT_HOMEPAGE_URL -> CPACK_PACKAGE_HOMEPAGE_URLAlex Turbov2019-12-093-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At CPack running time the `CMAKE_PROJECT_HOMEPAGE_URL` variable is not set. Internal CPack modules (e.g. CPackDEB, CPackRPM, CPackFreeBSD) should use `CPACK_PACKAGE_HOMEPAGE_URL` instead, which is available after inclusion of `CPack.cmake` into `CMakeLists.txt`. Closes: #19607
* | | | | | | | | | MSVC: Fixed missing import library for Windows 10 ARM64 (Desktop)shibayan2019-12-101-1/+1
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the same import library as x86/x64 by default for Windows 10 ARM64 (Desktop, not UWP). Fixes: #20077
* | | | | | | | | Merge topic 'wxwidgets_macos_weakframework'Brad King2019-12-101-0/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ada1824dc5 FindwxWidgets: Add support for 3.1.3 on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4126
| * | | | | | | | FindwxWidgets: Add support for 3.1.3 on macOSTobias Taschner2019-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously only -framework was used starting with 3.1.3 -weak_framework might also be used and has to be handled.
* | | | | | | | | Merge topic 'toc_on_ppc'Brad King2019-12-102-36/+26
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb984c6627 Check*CompilerFlag: Modernize modules d806263578 Merge branch 'backport-3.16-toc_on_ppc' into toc_on_ppc 90d8bd2deb Merge branch 'backport-3.15-toc_on_ppc' into backport-3.16-toc_on_ppc b35926e260 Check for support before adding bigtoc linker flag 958f858ad8 Check for support before adding bigtoc linker flag 8c7b7df788 bootstrap: Add target_link_options command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4122
| * | | | | | | | Check*CompilerFlag: Modernize modulesAlexander Grund2019-12-092-36/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - User lower-case names - Wrap in function instead of macro to avoid set-unset calls - Use IN LISTS for foreach
* | | | | | | | | Merge topic 'cuda_updates_for_10.2'Brad King2019-12-093-30/+38
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5341f5e4a1 CUDA: get header deps from compiler invocation when possible 7f15c99851 CUDA: forward unknown flags to host compiler when possible. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4099
| * | | | | | | | | CUDA: get header deps from compiler invocation when possibleRobert Maynard2019-11-292-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before CUDA 10.2 `nvcc` didn't support providing header dependency information while compiling.
| * | | | | | | | | CUDA: forward unknown flags to host compiler when possible.Robert Maynard2019-11-293-28/+29
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with CUDA 10.2 the nvcc compiler has gained support to automatically forward unknown flags to the host compiler. This behavior is highly desired as projcts that mix CUDA, C, C++ run into situation where flags such as `-pthread` which aren't supported by nvcc, are being applied to all source files and therefore break CUDA compilation.
* | | | | | | | | Merge topic 'CPackNuGet-version-spec'Brad King2019-12-091-9/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 161a19e547 CPackNuGet: Fix handling of version specs with '[' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4082
| * | | | | | | | | CPackNuGet: Fix handling of version specs with '['Yacoub Hossain2019-12-061-9/+2
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build a string directly to avoid depending on CMake lists which do not handle square brackets in values very well. Fixes: #20010
* | | | | | | | | Merge topic 'compiler-launcher-env'Brad King2019-12-094-0/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f48c59257 launcher: support setting a compiler launcher through the environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4095
| * | | | | | | | | launcher: support setting a compiler launcher through the environmentBen Boeckel2019-12-054-0/+20
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it much easier to use a launcher for all CMake projects in an environment rather than having to remember to pass the setting to every CMake build.
* | | | | | | | | Merge topic 'libarchive-target'Kyle Edwards2019-12-091-0/+15
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30488b3b9f FindLibArchive: create a target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4117
| * | | | | | | | FindLibArchive: create a targetT.J. Corona2019-12-051-0/+15
| | | | | | | | |
* | | | | | | | | Merge topic 'vs-clangcl-toolset'Brad King2019-12-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c125c6de0 VS: Support Visual Studio Clang Toolkit identification Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4111
| * | | | | | | | VS: Support Visual Studio Clang Toolkit identificationJustin Goshi2019-12-051-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMake that the `ClangCl` toolset uses the `ClangClExecutable` value as the path to the compiler executable.
* | | | | | | | Merge topic 'FindPkgConfig-cross-compile'Brad King2019-12-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f92a4b2399 FindPkgConfig: Fix path manipulations when cross compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4106
| * | | | | | | | FindPkgConfig: Fix path manipulations when cross compilingHugo Beauzée-Luyssen2019-12-021-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cross compiling from a unix machine, if(UNIX) is false, whih causes the path not to be fixed for unix, leading to false negative if PKG_CONFIG_PATH needs to be probed
* | | | | | | | Merge topic 'FindBLAS-atlas-static'Brad King2019-12-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85f4d580c9 FindBLAS: Search for libblas from ATLAS vendor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4105
| * | | | | | | | FindBLAS: Search for libblas from ATLAS vendorEisuke Kawashima2019-12-041-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbols such as `cblas_ccopy` are defined in `libblas.a` but NOT IN `libf77blas.a`. Fixes: #14320
* | | | | | | | Merge topic 'FindPNG-static-dep-m'Brad King2019-12-051-0/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad41c98cbb FindPNG: add 'm' dependencies to static lib on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4096
| * | | | | | | | FindPNG: add 'm' dependencies to static lib on LinuxDavid Callu2019-11-281-0/+10
| |/ / / / / / /
* | | | | | | | Merge topic 'FindThreads-lib-flag'Brad King2019-12-051-4/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7ffefea7c FindThreads: Restore hard-coded '-l' flag on library name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4112
| * | | | | | | FindThreads: Restore hard-coded '-l' flag on library nameBrad King2019-12-041-4/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit de5f123d3a (FindThreads: Do not hard-code '-l' flag on library name, 2019-09-23, v3.16.0-rc1~71^2). Some clients depend on the value of `CMAKE_THREAD_LIBS_INIT` to contain a valid flag. Fixes: #20061, #20065
* | | | | | | Merge topic 'pch-xcode-no-warning'Brad King2019-12-052-2/+6
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df8372da09 PCH: Do not add #pragma system_header for Xcode generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4098
| * | | | | | PCH: Do not add #pragma system_header for Xcode generatorCristian Adam2019-12-042-2/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes: #20039
| * | | | | Merge topic 'implicit-includes-extra-CR' into release-3.16Brad King2019-11-261-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d84afc7f2 Merge branch 'backport-implicit-includes-extra-CR' into implicit-includes-extra-CR 4b46523d90 CMakeParseImplicitIncludeInfo: Remove all CR chars from compiler output 2a5e5b25ba CMake 3.15.5 08173075c1 Merge branch 'doc-genex-tweak' into release-3.15 83dbef1135 Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15 881bca249d Merge branch 'vs-v142-csharp-flags' into release-3.15 dec3e9363e Merge branch 'backport-vs-16.4-global-targets' into release-3.15 ac1a1bf18b VS: Tell VS 16.4 not to verify CMake-provided custom command outputs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4088
| * \ \ \ \ \ Merge topic 'FindODBC-mingw' into release-3.16Brad King2019-11-261-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb8042b0ab FindODBC: Add library name for MinGW toolchains Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4076
* | \ \ \ \ \ \ Merge topic 'ninja-tool'Brad King2019-12-041-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feb5cb8d9d Ninja: Prefer first ninja tool available in PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4091
| * | | | | | | | Ninja: Prefer first ninja tool available in PATHBrad King2019-11-261-0/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We search for tools `ninja-build`, `ninja`, and `samu` as the build tool for the Ninja generator. Re-order the search to prefer whichever tool appears first in the `PATH`. This makes it easier for users to control which tool gets used when more than one is available. Fixes: #20028
* | | | | | | | Merge topic 'cuda_lang_specifies_cmake_library_arch'Brad King2019-12-041-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 974220b714 CUDA: persist CMAKE_LIBRARY_ARCHITECTURE and CUDA version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4090
| * | | | | | | CUDA: persist CMAKE_LIBRARY_ARCHITECTURE and CUDA versionRobert Maynard2019-11-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CUDA language failed to persist CMAKE_CUDA_LIBRARY_ARCHITECTURE and CMAKE_LIBRARY_ARCHITECTURE, causing find_ calls to fail when the only enabled language was CUDA.
* | | | | | | | Merge topic 'xlf-ninja'Brad King2019-11-265-0/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19f267c75e XL: Add support for Ninja and XL Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4075
| * | | | | | | | XL: Add support for Ninja and XL FortranBrad King2019-11-215-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja generator's support for Fortran requires that source files be preprocessed explicitly first. However, the `xlf` compiler does not have a simple `-E` option or equivalent to do preprocessing. The only documented way to get preprocessed output is to use `-d` to leave it behind, but only at an inflexible location. Instead, create our own `cpp` wrapper script and substitute it for the real preprocessor using `-tF -B ...`. Teach the wrapper to map the `cpp` output to the location we need and then invoke the real `cpp` underneath. Fixes: #19450