CMake merge requestshttps://gitlab.kitware.com/cmake/cmake/-/merge_requests2018-09-06T09:56:39-04:00https://gitlab.kitware.com/cmake/cmake/-/merge_requests/2354FindMatlab: Remove erroneous duplicate code2018-09-06T09:56:39-04:00Raffi EnficiaudFindMatlab: Remove erroneous duplicate codeFixes: #18221
Topic-rename: FindMatlab-no-CMAKE_CL_64
Fixes: #18221
Topic-rename: FindMatlab-no-CMAKE_CL_64
3.12.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/2349VS: Restore CMakeLists.txt references in each target2018-09-05T14:37:08-04:00Brad KingVS: Restore CMakeLists.txt references in each targetThe custom command de-duplication added by !1889 accidentally also applied to the `CMakeLists.txt` file
reference we put in each target. This file reference comes with a
custom command that has no dependencies and that is safe to run
re...The custom command de-duplication added by !1889 accidentally also applied to the `CMakeLists.txt` file
reference we put in each target. This file reference comes with a
custom command that has no dependencies and that is safe to run
repeatedly across multiple targets (via internal stamp checking).
Therefore it should be excluded from the de-duplication so that
`CMakeLists.txt` references appear in all targets for human reference.
Fixes: #183103.12.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/2348FindBoost: Fix old context lib discovery2018-09-05T14:37:08-04:00Igor KostenkoFindBoost: Fix old context lib discoveryOld versions provide `boost/context/all.hpp` and new versions provide `boost/context/detail/fcontext.hpp` but nether is provided by all versions.
Fixes: #18126
Topic-rename: FindBoost-old-context
Old versions provide `boost/context/all.hpp` and new versions provide `boost/context/detail/fcontext.hpp` but nether is provided by all versions.
Fixes: #18126
Topic-rename: FindBoost-old-context
3.12.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/2331CheckIPOSupported: Tolerate backslashes in output of failed checks2018-08-31T14:47:24-04:00Brad KingCheckIPOSupported: Tolerate backslashes in output of failed checksAvoid passing the output of our `try_compile` through a macro argument.
Macro invocations re-parse their arguments and so should not be given
arbitrary content that may contain backslashes and such.
Instead pass a simple message. This ...Avoid passing the output of our `try_compile` through a macro argument.
Macro invocations re-parse their arguments and so should not be given
arbitrary content that may contain backslashes and such.
Instead pass a simple message. This is also more readable in the case
that the macro generates a message itself. After the macro returns,
report the real output directly to the variable named by our caller.
Also record the output in a log file as other checks do on failure.
While at it, simplify checks for whether the caller passed `OUTPUT` or `RESULT`.
Fixes: #182443.12.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/2319Android: Add support for NDK r182018-08-30T09:14:40-04:00Brad KingAndroid: Add support for NDK r18NDK r18 drops GCC toolchains and some STL types. We need to choose a
clang toolchain by default when no gcc toolchains are available. Switch
the STL type default to `c++_static` when the old `gnustl_static`
default is not available.
U...NDK r18 drops GCC toolchains and some STL types. We need to choose a
clang toolchain by default when no gcc toolchains are available. Switch
the STL type default to `c++_static` when the old `gnustl_static`
default is not available.
Update the test suite to not run tests for STL types that do not exist.
Also do not expect the gcc toolchain `cpp` tool to be available because
r18 does not provide it. Also teach it to tolerate `gcc -dumpmachine`
output like `arm--linux-android` that differs from the toolchain prefix.
Fixes: #183013.12.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/2303Help: Fix typo, clang-tidy accepts -checks parameter with hyphen2018-10-17T04:34:03-04:00David DemelierHelp: Fix typo, clang-tidy accepts -checks parameter with hyphenThe example will not work without `-checks`.
Topic-rename: doc-clang-tidy-typo
The example will not work without `-checks`.
Topic-rename: doc-clang-tidy-typo
3.12.2Craig ScottCraig Scotthttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/2298FindCUDA: Do not find cublas_device on CUDA >= 9.22018-08-24T14:43:25-04:00Kenta KuboFindCUDA: Do not find cublas_device on CUDA >= 9.2According to [CUDA 9.2 Release Notes](https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#deprecated-features), `cublas_device` is deprecated and will be removed in the next release. That is also described in !2296.
The...According to [CUDA 9.2 Release Notes](https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#deprecated-features), `cublas_device` is deprecated and will be removed in the next release. That is also described in !2296.
Therefore, the condition of finding cublas_device should be that CUDA version is greater than 5.0 **and less than 9.2 (not containing)**.
Issue: #18290
Topic-rename: FindCUDA-deprecate-cublas_device
3.12.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/2296CUDA: Avoid using deprecated cublas_device to identify device lib dirs2018-08-24T14:43:25-04:00Robert MaynardCUDA: Avoid using deprecated cublas_device to identify device lib dirsUse `curand_static` to identify directories containing device libraries
because `cublas_device` is deprecated and will be removed in the future.
Issue: #18290
Topic-rename: cuda-no-cublas_device
Use `curand_static` to identify directories containing device libraries
because `cublas_device` is deprecated and will be removed in the future.
Issue: #18290
Topic-rename: cuda-no-cublas_device
3.12.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/2294EXPORT_PROPERTIES: Prevent null dereference for undefined property2018-08-22T16:52:21-04:00Craig ScottEXPORT_PROPERTIES: Prevent null dereference for undefined property3.12.2Craig ScottCraig Scotthttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/2278cmState: Clear GlobVerificationManager state on Reset2018-08-24T13:40:45-04:00Shane ParriscmState: Clear GlobVerificationManager state on ResetFollow up !1767.
Fixes: #18208
Topic-rename: state-reset-glob
Follow up !1767.
Fixes: #18208
Topic-rename: state-reset-glob
3.12.2Brad KingBrad King