Merge branch 'fix-Android-NsightTegra' into release

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()
 

Tests/CMakeLists.txt

@@ -2166,6 +2166,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     if(vs12)
       add_test_VSNsightTegra(vs12 "Visual Studio 12 2013")
     endif()
+    if(vs14)
+      add_test_VSNsightTegra(vs14 "Visual Studio 14 2015")
+    endif()
   endif()
 
   if (APPLE)

Tests/VSNsightTegra/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.3)
 project(VSNsightTegra C CXX)
 
-set(CMAKE_ANDROID_ARCH armv7-a-hard)
+set(CMAKE_ANDROID_ARCH armv7-a)
 set(CMAKE_ANDROID_STL_TYPE stlport_shared)
 set(CMAKE_ANDROID_API_MIN 9)
 set(CMAKE_ANDROID_API 15)