summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'UseSWIG-add-new-behavior'Craig Scott2018-04-041-40/+115
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ab4e38373 UseSWIG: Add new behavior for better support files management 438429d6fe UseSWIG: Rework tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1891
| * | | | | | UseSWIG: Add new behavior for better support files managementMarc Chevrier2018-04-031-40/+115
| |/ / / / / | | | | | | | | | | | | | | | | | | fixes: #17840
* | | | | | Merge topic 'FPHSA-include'Brad King2018-04-033-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6883801cd Find*: always include FPHSA shipped with CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1910
| * | | | | | Find*: always include FPHSA shipped with CMakeRolf Eike Beer2018-04-023-3/+3
| | | | | | |
* | | | | | | Merge topic 'FindDCMTK-includes'Brad King2018-04-031-8/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c948aa50d FindDCMTK: use CheckIncludeFiles instead of open coding it Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1911
| * | | | | | | FindDCMTK: use CheckIncludeFiles instead of open coding itRolf Eike Beer2018-04-021-8/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | While at it remove a needless status message.
* | | | | | | Merge topic 'android-clang-std-flags'Brad King2018-04-031-2/+9
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12e6796b62 Android: Do not pass non-existent Clang -std flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1913
| * | | | | | Android: Do not pass non-existent Clang -std flagsBrad King2018-04-021-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android NDK r16b comes with Android clang version 5.0.300080 (based on LLVM 5.0.300080) Although it claims version 5, it does not support the `-std=c++17` or `-std=c++2a` flags that upstream Clang does. Android NDK r17-beta1 comes with Android (4639204 based on r316199) clang version 6.0.1 that does have the flags.
* | | | | | | Fortran: Add support for .fpp extensionsBrad King2018-04-021-1/+1
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compilers such as `gfortran` recognize `.fpp` extensions to mean a Fortran source on which the preprocessor should run. Fixes: #17869
* | | | | | Merge topic 'remove-vs8-generator'Brad King2018-04-024-6/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb80af9093 Drop Visual Studio 8 2005 generator e7af91d026 Tests: Remove unused file from Tutorial Step7 test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1901
| * | | | | | Drop Visual Studio 8 2005 generatorBrad King2018-04-024-6/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | This generator has been deprecated since CMake 3.9. Remove it.
* | | | | | Merge topic 'FindCUDA-nvcc-executable-env'Brad King2018-04-021-10/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23119366e9 FindCUDA: Make nvcc configurable via CUDA_NVCC_EXECUTABLE env var Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1899
| * | | | | FindCUDA: Make nvcc configurable via CUDA_NVCC_EXECUTABLE env varEdward Z. Yang2018-03-291-10/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful if, for example, you want ccache to be used for nvcc. With the current behavior, cmake always picks up /usr/local/cuda/bin/nvcc, even if there is a ccache nvcc stub in the PATH. Allowing for CUDA_NVCC_EXECUTABLE lets us work around the problem. Signed-off-by: Edward Z. Yang <ezyang@fb.com>
* | | | | Merge topic 'features-c++20'Brad King2018-04-028-4/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8570dc7f64 Help: Update compiler versions in cmake-compile-features.7.rst 874d3d2948 Help: Add release note for C++ 20 support 7f295b1bd3 Features: Activate C++ 20 support for Clang 5.0+ 71cb8ce3a1 Features: Activate C++ 20 support for GNU 8.0+ 8f146c4508 Features: Activate C++ 20 support for MSVC 19.12.25835+ 7fe580a362 Features: Add infrastructure for C++ 20 language standard 1b328e09a3 Features: Use -std=c++17 for C++ 17 on Clang 5.0+ 0bc3e5788a Features: Use -std=c++17 for C++ 17 on GNU 8.0+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1892
| * | | | | Features: Activate C++ 20 support for Clang 5.0+Brad King2018-03-271-0/+5
| | | | | |
| * | | | | Features: Activate C++ 20 support for GNU 8.0+Brad King2018-03-271-0/+5
| | | | | |
| * | | | | Features: Activate C++ 20 support for MSVC 19.12.25835+Brad King2018-03-271-0/+4
| | | | | |
| * | | | | Features: Add infrastructure for C++ 20 language standardBrad King2018-03-277-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #17849
| * | | | | Features: Use -std=c++17 for C++ 17 on Clang 5.0+Brad King2018-03-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Clang 5.0 added support for the `-std=c++17` flag.
| * | | | | Features: Use -std=c++17 for C++ 17 on GNU 8.0+Brad King2018-03-261-1/+4
| |/ / / / | | | | | | | | | | | | | | | GNU 8 now documents official support for the `-std=c++17` flag.
* | | | | Features: Record C features for MSVCBrad King2018-03-292-0/+33
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MSVC C compiler has no notion of C language standards or flags. Tell CMake to assume that all language standards are available. Record available C language features depending on the version of the compiler. Fixes: #17858
* | | | Merge topic 'UseSWIG-fix-library-prefix'Brad King2018-03-261-9/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51b642679b UseSWIG: fix prefix library for Java on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Mathieu Malaterre <mathieu.malaterre@gmail.com> Merge-request: !1871
| * | | | UseSWIG: fix prefix library for Java on WindowsMarc Chevrier2018-03-221-9/+17
| | | | | | | | | | | | | | | | | | | | Fixes: #17836