diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-18 17:03:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-18 17:32:50 (GMT) |
| commit | 06c396126fb7734326075b56c859330a31ba5707 (patch) | |
| tree | 9228eb39d451d8f3820cccb491b7338350a404c5 /Modules | |
| parent | 5d8da06d60138c18eb68fab01b9b6e736ecd4914 (diff) | |
| download | CMake-06c396126fb7734326075b56c859330a31ba5707.zip CMake-06c396126fb7734326075b56c859330a31ba5707.tar.gz CMake-06c396126fb7734326075b56c859330a31ba5707.tar.bz2 | |
VS: Fix NVIDIA Nsight Tegra Visual Studio Edition support
The guard added by commit v3.7.0-rc1~229^2~17 (Android: Suppress new
functionality with Nsight Tegra in VS IDE builds, 2016-06-02) to
`Modules/Platform/Android-Determine.cmake` does not work in that
location because `CMAKE_VS_PLATFORM_NAME` is not set until after the
module is loaded. Change this particular guard to test for the Visual
Studio generator instead. If in the future we add support for using
Visual Studio for Android without Nsight Tegra then something more will
be needed, but this is good enough for now.
Closes: #16371
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Android-Determine.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Android-Determine.cmake b/Modules/Platform/Android-Determine.cmake index fd7c3bc..6d370ab 100644 --- a/Modules/Platform/Android-Determine.cmake +++ b/Modules/Platform/Android-Determine.cmake @@ -8,7 +8,7 @@ # Support for NVIDIA Nsight Tegra Visual Studio Edition was previously # implemented in the CMake VS IDE generators. Avoid interfering with # that functionality for now. Later we may try to integrate this. -if(CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android") +if(CMAKE_GENERATOR MATCHES "Visual Studio") return() endif() |