This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via b59659da1784db4997e7def4ea322a06672f15f7 (commit)
via 9af881d810d464a357c8bac5eb4423aa970fffb6 (commit)
via 6739d24030b7cb593be5557349ee6678b58bcc5a (commit)
via 06c396126fb7734326075b56c859330a31ba5707 (commit)
from 8c0bc67bed33fb53816b478fbbfae809720cbdfa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b59659da1784db4997e7def4ea322a06672f15f7
commit b59659da1784db4997e7def4ea322a06672f15f7
Merge: 8c0bc67 9af881d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 18 14:24:44 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Oct 18 14:24:44 2016 -0400
Merge topic 'fix-Android-NsightTegra' into next
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
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9af881d810d464a357c8bac5eb4423aa970fffb6
commit 9af881d810d464a357c8bac5eb4423aa970fffb6
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 18 13:31:16 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Oct 18 13:32:50 2016 -0400
Tests: Add VSNsightTegra test for VS 2015
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)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6739d24030b7cb593be5557349ee6678b58bcc5a
commit 6739d24030b7cb593be5557349ee6678b58bcc5a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 18 13:25:35 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Oct 18 13:32:50 2016 -0400
Tests: Fix VSNsightTegra test on Android NDK r12b
Test with architecture `armv7-a` instead of `armv7-a-hard` because the
latter is supporte supported only with NDK revisions r9c to r11c.
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)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06c396126fb7734326075b56c859330a31ba5707
commit 06c396126fb7734326075b56c859330a31ba5707
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 18 13:03:34 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Oct 18 13:32:50 2016 -0400
VS: Fix NVIDIA Nsight Tegra Visual Studio Edition support
The guard added by commit v3.7.0-rc1~229^2~17 (Android: Suppress new
functionality with Nsight Tegra in VS IDE builds, 2016-06-02) to
`Modules/Platform/Android-Determine.cmake` does not work in that
location because `CMAKE_VS_PLATFORM_NAME` is not set until after the
module is loaded. Change this particular guard to test for the Visual
Studio generator instead. If in the future we add support for using
Visual Studio for Android without Nsight Tegra then something more will
be needed, but this is good enough for now.
Closes: #16371
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()
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Android-Determine.cmake | 2 +-
Tests/CMakeLists.txt | 3 +++
Tests/VSNsightTegra/CMakeLists.txt | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
