summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'BLAS-no-target-in-libs'Brad King2018-04-252-2/+5
|\ | | | | | | | | | | | | | | 7d756f37cc FindBLAS: do not write an imported target name into BLAS_LIBRARIES 946846aaf5 FindPkgConfig: do not unset unused variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2006
| * FindBLAS: do not write an imported target name into BLAS_LIBRARIESRolf Eike Beer2018-04-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | Since commit v3.11.0-rc1~177^2 (FindBLAS: optionally query pkg-config for a library, 2017-12-15) the `BLAS_LIBRARIES` result variable may incorrectly contain the name of an imported target. Instead store the list of libraries in the variable. Unfortunately pkg_check_modules does not provide a way to get this so we need to use a (temporary) hack of reading `INTERFACE_LINK_LIBRARIES` from the interface library target. Fixes: #17934
| * FindPkgConfig: do not unset unused variableRolf Eike Beer2018-04-241-1/+0
| | | | | | | | _props is never used, it was a leftover from a development step.
* | Merge topic 'testbigendian-cache-check-fix'Brad King2018-04-251-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 7b1c5f9f05 TestBigEndian: Include CheckTypeSize outside macro Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1999
| * | TestBigEndian: Include CheckTypeSize outside macroCristian Adam2018-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using https://github.com/cristianadam/cmake-checks-cache I have noticed that CheckTypeSize would in certain cases have an empty `__check_type_size_dir` variable. The errors would point to `TestBigEndian`. By moving `include(CheckTypeSize)` outside the macro, the errors go away. Including dependencies of a module when the module is first included is simpler and cleaner anyway.
* | | Merge topic 'cuda-no-cache-host-compiler'Brad King2018-04-251-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bff4651f2e CUDA: Do not create CMAKE_CUDA_HOST_COMPILER cache entry Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2003
| * | | CUDA: Do not create CMAKE_CUDA_HOST_COMPILER cache entryBrad King2018-04-241-1/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users can create it through an explicit command-line option if desired. Initializing the variable as an empty cache entry can wipe out a normal variable of the same name that may have been set by a toolchain file. Since commit v3.8.0-rc1~261^2~11 (CUDA: Use the host compiler for linking CUDA executables and shared libs, 2016-09-19) we save the value of `CMAKE_CUDA_HOST_COMPILER` persistently in the compiler information file as a normal variable. Fixes: #17935
* | | Merge topic 'FindPython-stabilization'Brad King2018-04-241-5/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d02a9bacf6 FindPython: ensure correct architecture (i.e. 32/64bit) is used Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1991
| * | | FindPython: ensure correct architecture (i.e. 32/64bit) is usedMarc Chevrier2018-04-201-5/+74
| | | |
* | | | Merge topic 'CUDA7'Brad King2018-04-242-3/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fb2812d5b CUDA: Add compiler detection for CUDA < 7.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1993
| * | | | CUDA: Add compiler detection for CUDA < 7.5Henry Schreiner2018-04-232-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the CUDA version macros are not defined, run `nvcc --version` and extract the version from its output. Fixes: #17920
* | | | | Merge topic 'cpack-doc-defaults'Brad King2018-04-241-1/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30c8c9f55d CPack: Add CPACK_PACKAGE_HOMEPAGE_URL setting c9fa8f9442 CPack: Fix documented CPACK_PACKAGE_DESCRIPTION_SUMMARY default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1998
| * | | | | CPack: Add CPACK_PACKAGE_HOMEPAGE_URL settingAlex Turbov2018-04-231-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Initialize it from `CMAKE_PROJECT_HOMEPAGE_URL`.
| * | | | | CPack: Fix documented CPACK_PACKAGE_DESCRIPTION_SUMMARY defaultAlex Turbov2018-04-231-1/+1
| | |_|/ / | |/| | |
* | | | | Merge topic 'FindMatlab/mcr-compatibility'Brad King2018-04-241-222/+377
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 59fb9e89b2 FindMatlab: Matlab Runtime Compiler support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1970
| * | | | FindMatlab: Matlab Runtime Compiler supportRaffi Enficiaud2018-04-231-222/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Determining automatically the MCR version on OSX and Windows * Distinguishing between MCR and Matlab * Specific tests for the MCR * mexext on windows does not work properly: the mexext is hardcoded * Doc updates for the MCR Fixes: #16487
* | | | | Merge topic 'productbuild_missing_var_docs'Brad King2018-04-231-0/+16
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e41d44b38 Help: Document missing variables for productbuild CPack generator Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Clinton Stimpson <clinton@elemtech.com> Merge-request: !1995
| * | | | Help: Document missing variables for productbuild CPack generatorCraig Scott2018-04-211-0/+16
| | |/ / | |/| | | | | | | | | | Missing variables were CPACK_PREFLIGHT_<COMP>_SCRIPT and CPACK_POSTFLIGHT_<COMP>_SCRIPT.
* | | | Merge topic 'cuda-arch-repair'Brad King2018-04-231-13/+45
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 61b222f3ae CUDA/select_compute_arch: Fix detection on old CUDA with new card/driver Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1987
| * | | CUDA/select_compute_arch: Fix detection on old CUDA with new card/driverHenry Schreiner2018-04-201-13/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix version comparisons to handle patch components. List and check known archs for each version of CUDA so mismatching versions are not suggested. Fixes: #17921
* | | | Merge topic 'FindPython-debian-cross-comp'Brad King2018-04-201-15/+23
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 7855e4d6b7 FindPython: Add cross-compilation support for Debian-based systems. Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Marc Chevrier <marc.chevrier@sap.com> Merge-request: !1961
| * | | FindPython: Add cross-compilation support for Debian-based systems.Yee Fan2018-04-181-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debian-based Linux distributions locate their architecture-specific pythonX.Y-config tool at /usr/bin/<arch>-python<X.Y>-config. We first attempt to find and use the architecture-specific pythonX.Y-config tool. If the pythonX.Y-config tools are absent, then we proceed to find the architecture-specific Python libraries. Fixes: #17912
* | | | Merge topic 'FindJPEG-imported-targets'Brad King2018-04-191-15/+104
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87f2cf3b1c FindJPEG: Add imported target support and full test 13952a3b7f FindJPEG: Add multi config support and associated docs 1f6649b7d1 FindJPEG: Add version detection and associated test update and docs 8d07408a62 FindJPEG: Cleanup documentation formatting e70da3f0f3 FindJPEG: Clean up whitepaces and lowercase function names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1974
| * | | | FindJPEG: Add imported target support and full testMateusz Loskot2018-04-181-2/+40
| | | | |
| * | | | FindJPEG: Add multi config support and associated docsMateusz Loskot2018-04-171-2/+22
| | | | |
| * | | | FindJPEG: Add version detection and associated test update and docsMateusz Loskot2018-04-171-1/+26
| | | | |
| * | | | FindJPEG: Cleanup documentation formattingMateusz Loskot2018-04-171-9/+15
| | | | |
| * | | | FindJPEG: Clean up whitepaces and lowercase function namesMateusz Loskot2018-04-171-5/+5
| | | | |
* | | | | Merge topic 'InstallRequiredSystemLibraries-mfcm'Brad King2018-04-191-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bdf660cab5 InstallRequiredSystemLibraries: Check for existence of mfcm dlls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1980
| * | | | | InstallRequiredSystemLibraries: Check for existence of mfcm dllsChristof Krüger2018-04-181-0/+8
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, only existence of `mfc${v}.dll` and `mfc${v}d.dll` variants was checked and it was assumed that the managed variants `mfcm*.dll` also existed. This assumption doesn't hold with Visual Studio 2017. Check each file separately. Fixes: #17913
| * | | | Merge branch 'FindOpenMP-Intel-Windows' into release-3.11Brad King2018-04-161-13/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1957
| * \ \ \ \ Merge branch 'implicit-lib-gcceh-file' into release-3.11Brad King2018-04-161-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1967
| * \ \ \ \ \ Merge branch 'features-msvc-2017' into release-3.11Brad King2018-04-111-21/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1903
* | \ \ \ \ \ \ Merge topic 'depfile-flag'Brad King2018-04-193-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d67962c55a SunPro,XL: Add depfile flags to support Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1969
| * | | | | | | | SunPro,XL: Add depfile flags to support Ninja generatorEphi Sinowitz2018-04-173-0/+6
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CMAKE_DEPFILE_FLAGS_${lang} to SunPro and XL. These flags are used by the Ninja generator.
* | | | | | | | Merge topic 'CheckIncludeFile-required-libs'Brad King2018-04-193-0/+81
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a61ae3fb80 CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES 391a5837ee cmake_policy: Add undocumented PARENT_SCOPE option to GET 3c47ac5b25 OpenWatcom: Add workaround for lack of error on missing library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1978
| * | | | | | | | CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIESBrad King2018-04-183-0/+81
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other check modules honor this variable, so include file checks should too. Add policy `CMP0075` to enable the behavior in a compatible way. This change was originally made by commit v3.11.0-rc1~108^2 (CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES, 2017-12-24) but it was reverted by commit v3.11.1~9^2 (Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES", 2018-04-04) because the behavior change could affect checks in existing projects in an incompatible way. Fixes: #9514
* | | | | | | | Merge topic '17870-effective-system-name'Brad King2018-04-1943-66/+73
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4597396784 Apple: Use include_guard() within compiler config e95b3fd9bb Apple: Use CMAKE_EFFECTIVE_SYSTEM_NAME to share compiler info 84f9f63fcc Modules: Introduce CMAKE_EFFECTIVE_SYSTEM_NAME to lookup compiler info 9fa0f2eb56 CMakeFindPackageMode: Perform platform-specific initialization Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1964
| * | | | | | | Apple: Use include_guard() within compiler configGregor Jasny2018-04-184-16/+4
| | | | | | | |
| * | | | | | | Apple: Use CMAKE_EFFECTIVE_SYSTEM_NAME to share compiler infoGregor Jasny2018-04-1835-38/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apple platforms macOS, iOS, tvOS, and watchOS can all share the same compiler information. Rename `Darwin-*` modules to `Apple-*` and load them all through `CMAKE_EFFECTIVE_SYSTEM_NAME`. This saves duplication of 4 * 21 compiler information modules. Issue: #17870
| * | | | | | | Modules: Introduce CMAKE_EFFECTIVE_SYSTEM_NAME to lookup compiler infoGregor Jasny2018-04-188-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_EFFECTIVE_SYSTEM_NAME` variable to use for looking up compiler information modules instead of using `CMAKE_SYSTEM_NAME` directly. This will allow multiple platforms to share the same set of compiler information modules without spelling out all of them. Issue: #17870
| * | | | | | | CMakeFindPackageMode: Perform platform-specific initializationBrad King2018-04-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~565^2~3 (Add platform-specific initialization step when enabling languages, 2014-04-29) the main enable-language logic includes the `CMakeSystemSpecificInitialize` module to perform platform-specific initialization based on `CMAKE_SYSTEM_NAME`. This should be done during `cmake --find-package` mode too.
* | | | | | | | Merge topic 'android-ndk-r17'Brad King2018-04-181-1/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da294a039d Android: Add support for NDK r17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1976
| * | | | | | | | Android: Add support for NDK r17Brad King2018-04-171-1/+34
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `armeabi` ABI is no longer available, so we can no longer use it by default unconditionally. Instead detect all available ABIs and choose the oldest arm ABI that is available. Also update the test suite to account for the lack of `armeabi` support and pass as of Android NDK r17-beta2.
* | | | | | | | Merge topic 'fix-findmpi-lib-regex'Christian Pfeiffer2018-04-181-6/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bab4bc5f32 FindMPI: Fix libname regex to not match the compiler executable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1952
| * | | | | | | | FindMPI: Fix libname regex to not match the compiler executableChuck Atkins2018-04-121-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to match full path libraries on the mpicc link line, the current regex is not strict enough and improperly matches a partial path to the Xcode compiler path with homebrew mpich. This adjusts the regex to look for a space preceeding the library name to prevent the first argument, i.e. the compiler invocation, from being matched, and require either a space or end-pattern after the library to prevent mismatches with arguments that contain the library suffix but don't actually end with it.
* | | | | | | | | Merge topic 'FindOpenSSL-components'Craig Scott2018-04-171-19/+46
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 912a6c1cb5 FindOpenSSL: Add component support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1929
| * | | | | | | | FindOpenSSL: Add component supportHarry Mallon2018-04-161-19/+46
| | | | | | | | |
* | | | | | | | | Merge topic 'FindOpenAL-std-includes'Brad King2018-04-171-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d9d1c9dcf FindOpenAL: Find AL/al.h or OpenAL/al.h in standard include paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1963
| * | | | | | | | | FindOpenAL: Find AL/al.h or OpenAL/al.h in standard include pathsJames Jones2018-04-161-1/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `AL` and `OpenAL` to the `PATH_SUFFIXES` so that they are searched within the standard system include directories. We already have `include/AL`, `include/OpenAL`, and `include` to help out within the locations specified by `PATHS`, though it is unclear why it was done this way instead of adding the suffixes to all the `PATHS` explicitly.