Added support for unversioned libs for android

qgis · Nov 22, 2011 · 4b4cbe5 · 4b4cbe5
1 parent 8ad2f6b
commit 4b4cbe5
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 14 deletions.
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -93,8 +93,6 @@ ENDIF (WIN32)
 ADD_LIBRARY(qgis_analysis SHARED ${QGIS_ANALYSIS_SRCS} ${QGIS_ANALYSIS_MOC_SRCS} ${QGIS_ANALYSIS_HDRS})
 
 SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
-  VERSION ${COMPLETE_VERSION}
-  SOVERSION ${COMPLETE_VERSION}
   # no moc headers, messes up PROPERTIES syntax
   PUBLIC_HEADER "${QGIS_ANALYSIS_HDRS}"
   CLEAN_DIRECT_OUTPUT 1
@@ -104,6 +102,14 @@ SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
   MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
   MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_analysis)
 
+#generate unversioned libs for android
+IF (NOT ANDROID)
+  SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
+    VERSION ${COMPLETE_VERSION}
+    SOVERSION ${COMPLETE_VERSION}
+    )
+ENDIF (NOT ANDROID)
+
 ADD_DEPENDENCIES(qgis_analysis qgis_core)
 
 TARGET_LINK_LIBRARIES(qgis_analysis

diff --git a/src/analysis/network/CMakeLists.txt b/src/analysis/network/CMakeLists.txt
@@ -45,8 +45,6 @@ INCLUDE_DIRECTORIES(
 ADD_LIBRARY(qgis_networkanalysis SHARED ${QGIS_NETWORK_ANALYSIS_SRCS} ${QGIS_NETWORK_ANALYSIS_MOC_SRCS} ${QGIS_NETWORK_ANALYSIS_HDRS})
 
 SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES
-  VERSION ${COMPLETE_VERSION}
-  SOVERSION ${COMPLETE_VERSION}
   PUBLIC_HEADER "${QGIS_NETWORK_ANALYSIS_HDRS};${QGIS_NETWORK_ANALYSIS_MOC_HDRS}"
   CLEAN_DIRECT_OUTPUT 1
   FRAMEWORK 1
@@ -55,6 +53,14 @@ SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES
   MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
   MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_networkanalysis)
 
+#generate unversioned libs for android
+IF (NOT ANDROID)
+  SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES
+    VERSION ${COMPLETE_VERSION}
+    SOVERSION ${COMPLETE_VERSION}
+    )
+ENDIF (NOT ANDROID)
+
 ADD_DEPENDENCIES(qgis_networkanalysis qgis_core)
 
 TARGET_LINK_LIBRARIES(qgis_networkanalysis

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -461,8 +461,6 @@ ENDIF (WITH_INTERNAL_SPATIALINDEX)
 ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC} ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS})
 
 SET_TARGET_PROPERTIES(qgis_core PROPERTIES
-  VERSION ${COMPLETE_VERSION}
-  SOVERSION ${COMPLETE_VERSION}
   PUBLIC_HEADER "${QGIS_CORE_HDRS};${QGIS_CORE_MOC_HDRS}"
   CLEAN_DIRECT_OUTPUT 1
   FRAMEWORK 1
@@ -471,6 +469,14 @@ SET_TARGET_PROPERTIES(qgis_core PROPERTIES
   MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
   MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_core)
 
+#generate unversioned libs for android
+IF (NOT ANDROID)
+  SET_TARGET_PROPERTIES(qgis_core PROPERTIES
+    VERSION ${COMPLETE_VERSION}
+    SOVERSION ${COMPLETE_VERSION}
+    )
+ENDIF (NOT ANDROID)
+
 # make sure to create qgsversion.h before compiling
 ADD_DEPENDENCIES(qgis_core version)
 

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -239,8 +239,6 @@ ENDIF(MSVC)
 ADD_LIBRARY(qgis_gui SHARED ${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS} ${QGIS_GUI_HDRS} ${QGIS_GUI_MOC_HDRS})
 
 SET_TARGET_PROPERTIES(qgis_gui PROPERTIES
-  VERSION ${COMPLETE_VERSION}
-  SOVERSION ${COMPLETE_VERSION}
   PUBLIC_HEADER "${QGIS_GUI_HDRS};${QGIS_GUI_MOC_HDRS}"
   CLEAN_DIRECT_OUTPUT 1
   FRAMEWORK 1
@@ -249,6 +247,14 @@ SET_TARGET_PROPERTIES(qgis_gui PROPERTIES
   MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
   MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_gui)
 
+#generate unversioned libs for android
+IF (NOT ANDROID)
+  SET_TARGET_PROPERTIES(qgis_gui PROPERTIES
+    VERSION ${COMPLETE_VERSION}
+    SOVERSION ${COMPLETE_VERSION}
+    )
+ENDIF (NOT ANDROID)
+
 # make sure that UI files will be processed first
 ADD_DEPENDENCIES(qgis_gui ui)
 

diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
@@ -19,8 +19,6 @@ INCLUDE_DIRECTORIES(
 ADD_LIBRARY(qgisgrass SHARED qgsgrass.cpp)
 
 SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
-  VERSION ${COMPLETE_VERSION}
-  SOVERSION ${COMPLETE_VERSION}
   CLEAN_DIRECT_OUTPUT 1
   FRAMEWORK 1
   FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
@@ -29,6 +27,14 @@ SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
   MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgisgrass
   COMPILE_FLAGS "\"-DGRASS_LIB_EXPORT=${DLLEXPORT}\" \"-DGRASS_EXPORT=${DLLIMPORT}\"" )
 
+#generate unversioned libs for android
+IF (NOT ANDROID)
+  SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
+    VERSION ${COMPLETE_VERSION}
+    SOVERSION ${COMPLETE_VERSION}
+    )
+ENDIF (NOT ANDROID)
+
 TARGET_LINK_LIBRARIES(qgisgrass
   qgis_core
   ${GRASS_LIBRARY_gis}

diff --git a/src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt b/src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
@@ -28,15 +28,21 @@ INCLUDE_DIRECTORIES(
 ADD_LIBRARY (qgissqlanyconnection SHARED ${SACONN_SRCS})
 
 SET_TARGET_PROPERTIES(qgissqlanyconnection PROPERTIES
-  VERSION ${COMPLETE_VERSION}
-  SOVERSION ${COMPLETE_VERSION}
   CLEAN_DIRECT_OUTPUT 1
   FRAMEWORK 1
   FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
   MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
   MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
   MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgisgrass)
 
+#generate unversioned libs for android
+IF (NOT ANDROID)
+  SET_TARGET_PROPERTIES(qgissqlanyconnection PROPERTIES
+    VERSION ${COMPLETE_VERSION}
+    SOVERSION ${COMPLETE_VERSION}
+    )
+ENDIF (NOT ANDROID)
+
 TARGET_LINK_LIBRARIES(qgissqlanyconnection
   qgis_core
 )

diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
@@ -23,10 +23,16 @@ INCLUDE_DIRECTORIES(
 ADD_LIBRARY (qgispython SHARED ${QGISPYTHON_SRCS})
 
 SET_TARGET_PROPERTIES(qgispython PROPERTIES
-  VERSION ${COMPLETE_VERSION}
-  SOVERSION ${COMPLETE_VERSION}
   CLEAN_DIRECT_OUTPUT 1)
 
+#generate unversioned libs for android
+IF (NOT ANDROID)
+  SET_TARGET_PROPERTIES(qgispython PROPERTIES
+    VERSION ${COMPLETE_VERSION}
+    SOVERSION ${COMPLETE_VERSION}
+    )
+ENDIF (NOT ANDROID)
+
 TARGET_LINK_LIBRARIES(qgispython
   qgis_core
   ${PYTHON_LIBRARY}