diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-19 12:48:31 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-19 12:48:31 (GMT) |
| commit | 1745733809ebb31640b4f9205f2eee96e932e995 (patch) | |
| tree | 3a2c67316166beed776c26408cf1d07d342dee43 /Modules/Platform | |
| parent | 050ef26061b6b73cc7c48dd8e7180ee0e7d5c073 (diff) | |
| parent | 9af881d810d464a357c8bac5eb4423aa970fffb6 (diff) | |
| download | CMake-1745733809ebb31640b4f9205f2eee96e932e995.zip CMake-1745733809ebb31640b4f9205f2eee96e932e995.tar.gz CMake-1745733809ebb31640b4f9205f2eee96e932e995.tar.bz2 | |
Merge topic 'fix-Android-NsightTegra'
9af881d8 Tests: Add VSNsightTegra test for VS 2015
6739d240 Tests: Fix VSNsightTegra test on Android NDK r12b
06c39612 VS: Fix NVIDIA Nsight Tegra Visual Studio Edition support
Diffstat (limited to 'Modules/Platform')
| -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() |