kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-Android-NsightTegra' into release

This commit is contained in:
Brad King 2016-10-18 14:24:34 -04:00
parent 074999171c 9af881d810
commit a0c539b546
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Platform/Android-Determine.cmake
View File

@ -8,7 +8,7 @@
# Support for NVIDIA Nsight Tegra Visual Studio Edition was previously # Support for NVIDIA Nsight Tegra Visual Studio Edition was previously
# implemented in the CMake VS IDE generators. Avoid interfering with # implemented in the CMake VS IDE generators. Avoid interfering with
# that functionality for now. Later we may try to integrate this. # 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() return()
endif() endif()

3
Tests/CMakeLists.txt
View File

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

2
Tests/VSNsightTegra/CMakeLists.txt
View File

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.3) cmake_minimum_required(VERSION 3.3)
project(VSNsightTegra C CXX) 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_STL_TYPE stlport_shared)
set(CMAKE_ANDROID_API_MIN 9) set(CMAKE_ANDROID_API_MIN 9)
set(CMAKE_ANDROID_API 15) set(CMAKE_ANDROID_API 15)