[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1392-ge6b1595

[Stephen Kelly]

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  e6b15956f860685e2ba116e01e3c34967717929d (commit)
       via  afe5170c9753e82e6a5f321ec9fde2d0c81710ef (commit)
       via  6373e08d439195557f77e8de7081252a5326f463 (commit)
      from  496f8bdcaf4fde8f1b16e52668398d658dca091e (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=e6b15956f860685e2ba116e01e3c34967717929d
commit e6b15956f860685e2ba116e01e3c34967717929d
Merge: 496f8bd afe5170
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 21 09:25:01 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 21 09:25:01 2014 -0400

    Merge topic 'Android-executables' into next
    
    afe5170c Android: Build executables as PIE and with .so extension.
    6373e08d CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afe5170c9753e82e6a5f321ec9fde2d0c81710ef
commit afe5170c9753e82e6a5f321ec9fde2d0c81710ef
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 21 13:45:48 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Mar 21 14:17:10 2014 +0100

    Android: Build executables as PIE and with .so extension.

diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake
index a4c122d..29e9919 100644
--- a/Modules/Platform/Android.cmake
+++ b/Modules/Platform/Android.cmake
@@ -3,3 +3,16 @@ 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 "")
+
+# Gui executables on Android are loaded as plugins by the java process,
+# so build them as PIC by default.  The packaging system accepts only files
+# which have a .so suffix, so set the CMAKE_EXECUTABLE_SUFFIX to that.
+# Non-gui native executables are also permitted on Android.  Users wishing
+# to create such executables may use something like
+#   set_property(TARGET MyConsoleExe PROPERTY SUFFIX "")
+#   set_property(TARGET MyConsoleExe PROPERTY POSITION_INDEPENDENT_CODE OFF)
+# to clear the suffix and -fPIE flag, if desired.
+# This possibly does not work with older Android versions:
+#  https://groups.google.com/forum/#!msg/android-security-discuss/B9BEdc_faRw/iMjpQqXMA1YJ
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_EXECUTABLE_SUFFIX .so)

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

Summary of changes:
 Modules/Platform/Android.cmake |   13 +++++++++++++
 Source/CMakeVersion.cmake      |    2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake