Commit 17457338 authored by Brad King's avatar Brad King Committed by Kitware Robot

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
parents 050ef260 9af881d8
......@@ -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()
......
......@@ -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)
......
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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment