[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1094-gfe76ead

Stephen Kelly steveire at gmail.com
Mon Mar 17 07:30:20 EDT 2014


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  fe76eadb81e89374967c3aebbd762e43108c56fe (commit)
       via  f6cf787134e527f61def1304a405cae47e8da472 (commit)
      from  949ca3769c349da689f5652af81b6bbd41209a1d (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=fe76eadb81e89374967c3aebbd762e43108c56fe
commit fe76eadb81e89374967c3aebbd762e43108c56fe
Merge: 949ca37 f6cf787
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 17 07:30:19 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 17 07:30:19 2014 -0400

    Merge topic 'Android-platform' into next
    
    f6cf7871 Add an Andriod platform file.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6cf787134e527f61def1304a405cae47e8da472
commit f6cf787134e527f61def1304a405cae47e8da472
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 5 09:52:45 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 17 11:25:32 2014 +0100

    Add an Andriod platform file.

diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake
new file mode 100644
index 0000000..d3914be
--- /dev/null
+++ b/Modules/Platform/Android.cmake
@@ -0,0 +1,6 @@
+include(Platform/Linux)
+set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "")
+# RPath is useless on Android, because we can't determine the installation
+# location ahead of time.
+set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "")
+set(Android 1)

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Android.cmake |    6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 Modules/Platform/Android.cmake


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list