[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2206-g8a4fedb

[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  8a4fedbbd871c2aca66cf65830de8d9feaebe216 (commit)
       via  00912e2cbf1ba14eb81fe7d5b3240042a01cfcff (commit)
      from  f6c27541fffd728e99a6685e30c8af5f09e7f9ca (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=8a4fedbbd871c2aca66cf65830de8d9feaebe216
commit 8a4fedbbd871c2aca66cf65830de8d9feaebe216
Merge: f6c2754 00912e2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 10 11:33:44 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 10 11:33:44 2014 -0400

    Merge topic 'Android-executables' into next
    
    00912e2c Revert "Android: Build executables as PIE and with .so extension."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00912e2cbf1ba14eb81fe7d5b3240042a01cfcff
commit 00912e2cbf1ba14eb81fe7d5b3240042a01cfcff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 10 17:33:15 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Apr 10 17:33:19 2014 +0200

    Revert "Android: Build executables as PIE and with .so extension."
    
    This reverts commit afe5170c9753e82e6a5f321ec9fde2d0c81710ef.

diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake
index 29e9919..a4c122d 100644
--- a/Modules/Platform/Android.cmake
+++ b/Modules/Platform/Android.cmake
@@ -3,16 +3,3 @@ 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 -------------
 1 file changed, 13 deletions(-)


hooks/post-receive
-- 
CMake