diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-18 18:24:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-18 18:24:34 (GMT) |
| commit | a0c539b5460da283433976053ea181f07fcea32e (patch) | |
| tree | d7798100b1c885e3de2f711acdd2b107949675b0 | |
| parent | 074999171cfcf21679a9417ef097df6a21fd3924 (diff) | |
| parent | 9af881d810d464a357c8bac5eb4423aa970fffb6 (diff) | |
| download | CMake-a0c539b5460da283433976053ea181f07fcea32e.zip CMake-a0c539b5460da283433976053ea181f07fcea32e.tar.gz CMake-a0c539b5460da283433976053ea181f07fcea32e.tar.bz2 | |
Merge branch 'fix-Android-NsightTegra' into release
| -rw-r--r-- | Modules/Platform/Android-Determine.cmake | 2 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/VSNsightTegra/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 2 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() diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 31ed2eb..7df9403 100644 --- a/Tests/CMakeLists.txt +++ b/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) diff --git a/Tests/VSNsightTegra/CMakeLists.txt b/Tests/VSNsightTegra/CMakeLists.txt index 61a04fd..6d74f2f 100644 --- a/Tests/VSNsightTegra/CMakeLists.txt +++ b/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) |