summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | Merge topic 'FindOpenMP-Intel-Windows'Brad King2018-04-171-13/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c7433e874 FindOpenMP: Fix support for Intel on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1957
| * | | | FindOpenMP: Fix support for Intel on WindowsRoland Schulz2018-04-161-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.11.0-rc1~334^2 (FindOpenMP: Use NO_DEFAULT_PATH where appropriate, 2017-11-15) broke partial support for Intel on Windows. Since `OpenMP_${LANG}_IMPLICIT_LINK_DIRS` is empty for this compiler the `find_library` call without `NO_DEFAULT_PATH` worked accidentally in environments with the needed libraries in the search path already. Fix support for Intel on Windows by simply removing our explicit search for the `libiomp5md` library. In cases that it is needed, the compiler already inserts metadata in `.obj` files to tell the MSVC linker to use the library. Suggested-by: Christian Pfeiffer <cpfeiffer@live.de> Fixes: #17910
* | | | | Merge topic 'implicit-lib-gcceh-file'Brad King2018-04-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb0498357f Exclude "libgcc_eh" library files from implicit link libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1967
| * | | | | Exclude "libgcc_eh" library files from implicit link librariesBrad King2018-04-161-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix in commit v3.9.6~1^2 (Restore exclusion of "gcc_eh" from implicit link libraries, 2017-11-07) to also exclude `gcc_eh` libraries referenced by absolute path to the library file. Issue: #17436
* | | | | Merge topic 'cuda-compiler-loaded'Brad King2018-04-161-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 595aa12811 CUDA: Set CMAKE_CUDA_COMPILER_LOADED variable when language is enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1955
| * | | | CUDA: Set CMAKE_CUDA_COMPILER_LOADED variable when language is enabledHenry Schreiner2018-04-131-0/+1
| | |_|/ | |/| | | | | | | | | | We already do this for C, CXX, Fortran, etc.
* | | | Merge topic 'clang-cl-std'Brad King2018-04-131-5/+42
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 3f82c5904d Clang: Add standard flags support when simulating MSVC 8381bc12ad Clang: Avoid extra C++ feature detection when simulating MSVC 6cddf7ba32 Clang: Refactor standard flags logic when simulating MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1906
| * | | Clang: Add standard flags support when simulating MSVCRuben Van Boxem2018-04-111-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When Clang 3.9 simulates MSVC 19.0 or higher it knows the `-std:` flags that such versions of MSVC defines. Fixes: #17866
| * | | Clang: Avoid extra C++ feature detection when simulating MSVCBrad King2018-04-111-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the optimization from commit v3.10.0-rc1~131^2 (MSVC: Avoid unnecessary C++ feature detection steps, 2017-09-11) to the case of Clang simulating a version of MSVC that does not define standards. Issue: #17274
| * | | Clang: Refactor standard flags logic when simulating MSVCBrad King2018-04-111-5/+6
| | | | | | | | | | | | | | | | | | | | Consolidate the compile options and standard defaults branches. Add comments.
* | | | Merge topic 'features-msvc-2017'Brad King2018-04-121-21/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f4272cc06 Features: Record for VS 2017 through 15.6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1903
| * | | | Features: Record for VS 2017 through 15.6Daniel Filipe2018-04-111-21/+15
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | VS 15.3 has more features than we recorded in commit v3.7.0-rc1~156^2~2 (Features: Record features for VS 15 Preview 4, 2016-09-05). While at it, update comments and simplify some cases.
* | | | Merge topic 'FindMatlab-handle-exception'Brad King2018-04-121-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffb1f19191 FindMatlab: add unit tests 44c916b4c8 FindMatlab: always handle uncaught exception Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1946
| * | | | FindMatlab: always handle uncaught exceptionClemens Buchacher2018-04-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If runtests('$unittest_file') throws an exception it is ignored. It is easy to produce such an exception by passing a nonexistent file as UNITTEST_FILE. We already handle exceptions if the option NO_UNITTEST_FRAMEWORK is set. Use the same method to handle exceptions thrown by runtests or by a custom_Matlab_test_command. Fixes #16660.
* | | | | Merge topic 'FindwxWidgets-local-var'Brad King2018-04-121-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9174786008 FindwxWidgets: Use more private name for local variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1951
| * | | | | FindwxWidgets: Use more private name for local variableAndrea Ranieri2018-04-111-4/+6
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Avoid using a `_filename` variable that may be set by project code. Also unset the variable name that we do use to avoid conflict.
* | | | | Merge topic 'FindImageMagick-FixForMultipleInstalls'Brad King2018-04-121-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 68d1fc89ed FindImageMagick: Find components in same locations as main package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1917
| * | | | FindImageMagick: Find components in same locations as main packageRoman Wüger2018-04-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix component include/library path if multiple versions are installed. When searching for individual components, look only in the locations we expect to find them that we already computed.
* | | | | UseSWIG: fix erroneous generator expressionsMarc Chevrier2018-04-101-7/+11
| |/ / / |/| | | | | | | | | | | Add note regarding multi-config generators
* | | | Merge topic 'FindCUDA-nvcc-clcache-support'Brad King2018-04-091-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2da3698447 FindCUDA: Add support for clcache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1933
| * | | | FindCUDA: Add support for clcacheEdward Z. Yang2018-04-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `CMAKE_C_COMPILER` is `clcache`, pass plain `cl` as the host compiler to `nvcc`. Otherwise, `nvcc` does not accept it. Signed-off-by: Edward Z. Yang <ezyang@fb.com>
* | | | | Merge topic 'findwxwidgets-msys-library-dirs'Brad King2018-04-051-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44ad8e48de FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1930
| * | | | | FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYSARATA Mizuki2018-04-041-0/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for `wxWidgets_LIBRARIES` variable, introduced by e8b77084, fails with the `wx-config` script generated by an MSYS build, because `wxWidgets_LIBRARY_DIRS` is in POSIX style. This commit fixes the problem with `wxWidgets_LIBRARY_DIRS` by converting it to Windows style. The actual code were copied from bf643286, which does the same thing for `wxWidgets_INCLUDE_DIRS`.
* | | | | Merge topic 'msvc-toolset-version-variable'Brad King2018-04-056-134/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45bf6f6246 Modules: Use MSVC_TOOLSET_VERSION variable to simplify logic 304f493e57 MSVC: Add MSVC_TOOLSET_VERSION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1882
| * | | | | Modules: Use MSVC_TOOLSET_VERSION variable to simplify logicArkady Shapkin2018-04-045-134/+48
| | | | | |
| * | | | | MSVC: Add MSVC_TOOLSET_VERSION variableArkady Shapkin2018-04-041-0/+25
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Provide the MSVC toolset version number based on the compiler version. Fixes: #16923
* | | | | Merge topic 'revert-CheckIncludeFile-required-libs'Brad King2018-04-053-9/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 35109e718b Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1931
| * | | | Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES"Brad King2018-04-043-9/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit v3.11.0-rc1~108^2 (CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES, 2017-12-24). The behavior change can affect checks in existing projects that don't expect the behavior. Introducing the behavior again will require a policy. Fixes: #17874 Issue: #9514
| * | | Merge branch 'boost-1.67' into release-3.11Brad King2018-03-211-41/+129
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1865
* | \ \ \ Merge topic 'wcdh-bare-features'Brad King2018-04-041-33/+83
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f38d050231 WCDH: introduce BARE_FEATURES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1869
| * | | | | WCDH: introduce BARE_FEATURESRolf Eike Beer2018-04-031-33/+83
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | This allows defining compat versions of some C/C++ features with the name of the keyword itself, so all code can look as if it was written for the new language standard.
* | | | | Merge topic 'android-no-libstdc++'Brad King2018-04-048-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 843d55de29 Android: Suppress implicit -lstdc++ linker flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1919
| * | | | | Android: Suppress implicit -lstdc++ linker flagBrad King2018-04-038-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The chosen STL libraries are already linked explicitly so we shouldn't let the compiler add its implicit `-lstdc++` (the default) when invoking the linker. Fixes: #17863 NDK-Issue: https://github.com/android-ndk/ndk/issues/105 Inspired-by: Tom Hughes <tomtheengineer@gmail.com>
* | | | | | Merge topic 'cuda_support_system_libraries_with_device_symbols'Brad King2018-04-042-4/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41eab150a8 CUDA: Pass more link libraries to device linking 88c7abb740 CUDA: Pass host linker directories to device linker Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1634
| * | | | | | CUDA: Pass host linker directories to device linkerBrad King2018-03-282-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some environments, libraries containing device code are installed in directories searched by the host linker but not passed by nvcc to nvlink. Make these libraries available by explicitly passing the host linker search directories during device linking. Issue: #16317
* | | | | | | Merge topic 'FindPython-stabilization'Brad King2018-04-042-7/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1fd2bbe75 FindPython: enhance multiple major versions lookup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1915
| * | | | | | | FindPython: enhance multiple major versions lookupMarc Chevrier2018-04-032-7/+17
| | |_|_|_|_|/ | |/| | | | |
generated by cgit v0.12 at 2025-02-07 04:43:23 (GMT)