[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2211-g299ba25
Stephen Kelly
steveire at gmail.com
Thu Apr 10 11:35:42 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 299ba25588fa40cd75d6eac2c5d56ee79bfd6dd7 (commit)
via 4b31f0649c530e34044dd4cb87b3267b2ec5e620 (commit)
from 2e2726bbb89539fac7c24d3e2ab9b076a9fd9ab1 (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=299ba25588fa40cd75d6eac2c5d56ee79bfd6dd7
commit 299ba25588fa40cd75d6eac2c5d56ee79bfd6dd7
Merge: 2e2726b 4b31f06
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 10 11:35:41 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 10 11:35:41 2014 -0400
Merge topic 'revert-Android-platform' into next
4b31f064 Revert "Modules: Add an Andriod platform file"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b31f0649c530e34044dd4cb87b3267b2ec5e620
commit 4b31f0649c530e34044dd4cb87b3267b2ec5e620
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 10 17:34:41 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Apr 10 17:34:41 2014 +0200
Revert "Modules: Add an Andriod platform file"
This reverts commit 77f06b145d57c4665ff5d71b89a70c54a009ad14.
It may be re-added in the future when the requirements for that
platform are better known and supported by CMake.
diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake
deleted file mode 100644
index a4c122d..0000000
--- a/Modules/Platform/Android.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-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 "")
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Android.cmake | 5 -----
1 file changed, 5 deletions(-)
delete mode 100644 Modules/Platform/Android.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list