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 1dd552cb9e698232d4f1ff2648793497d000a8f3 (commit)
via 72612e2e56fc137959a94b2939b0d84fc52ed8a5 (commit)
from 624c3ba1e87966bdeb8c0af40e36580cd6524e73 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1dd552cb9e698232d4f1ff2648793497d000a8f3
commit 1dd552cb9e698232d4f1ff2648793497d000a8f3
Merge: 624c3ba 72612e2
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Sep 19 10:21:52 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Sep 19 10:21:52 2014 -0400
Merge topic 'vs-nsight-tegra-generator' into next
72612e2e VS: Fix Tegra-Android platform linking of libraries by name
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72612e2e56fc137959a94b2939b0d84fc52ed8a5
commit 72612e2e56fc137959a94b2939b0d84fc52ed8a5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Sep 19 10:11:36 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Sep 19 10:18:18 2014 -0400
VS: Fix Tegra-Android platform linking of libraries by name
Nsight Tegra Visual Studio Edition handles prefixing of library names
with '-l' automatically, so teach the generator not to do so.
Reported-by: Mourad Boufarguine <mou...@boufarguine.name>
diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake
index e6d4fcf..1bdad04 100644
--- a/Modules/Platform/Android.cmake
+++ b/Modules/Platform/Android.cmake
@@ -7,3 +7,9 @@ set(CMAKE_PLATFORM_NO_VERSIONED_SONAME 1)
# Android reportedly ignores RPATH, and we cannot predict the install
# location anyway.
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "")
+
+# Nsight Tegra Visual Studio Edition takes care of
+# prefixing library names with '-l'.
+if(CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android")
+ set(CMAKE_LINK_LIBRARY_FLAG "")
+endif()
diff --git a/Tests/VSNsightTegra/CMakeLists.txt
b/Tests/VSNsightTegra/CMakeLists.txt
index e011cac..570733b 100644
--- a/Tests/VSNsightTegra/CMakeLists.txt
+++ b/Tests/VSNsightTegra/CMakeLists.txt
@@ -36,3 +36,4 @@ add_executable(twolib-second
)
target_include_directories(twolib-second PUBLIC jni)
target_link_libraries(twolib-second twolib-first)
+target_link_libraries(twolib-second m) # test linking to library by name
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Android.cmake | 6 ++++++
Tests/VSNsightTegra/CMakeLists.txt | 1 +
2 files changed, 7 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
