Skip to content

Commit 4b4cbe5

Browse files
mbernasocchimbernasocchi
committedNov 22, 2011
Added support for unversioned libs for android
·
ltr-3_40Before-merge-new_vector_api
1 parent 8ad2f6b commit 4b4cbe5

File tree

7 files changed

+56
-14
lines changed

7 files changed

+56
-14
lines changed
 

‎src/analysis/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ ENDIF (WIN32)
9393
ADD_LIBRARY(qgis_analysis SHARED ${QGIS_ANALYSIS_SRCS} ${QGIS_ANALYSIS_MOC_SRCS} ${QGIS_ANALYSIS_HDRS})
9494

9595
SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
96-
VERSION ${COMPLETE_VERSION}
97-
SOVERSION ${COMPLETE_VERSION}
9896
# no moc headers, messes up PROPERTIES syntax
9997
PUBLIC_HEADER "${QGIS_ANALYSIS_HDRS}"
10098
CLEAN_DIRECT_OUTPUT 1
@@ -104,6 +102,14 @@ SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
104102
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
105103
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_analysis)
106104

105+
#generate unversioned libs for android
106+
IF (NOT ANDROID)
107+
SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
108+
VERSION ${COMPLETE_VERSION}
109+
SOVERSION ${COMPLETE_VERSION}
110+
)
111+
ENDIF (NOT ANDROID)
112+
107113
ADD_DEPENDENCIES(qgis_analysis qgis_core)
108114

109115
TARGET_LINK_LIBRARIES(qgis_analysis

‎src/analysis/network/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ INCLUDE_DIRECTORIES(
4545
ADD_LIBRARY(qgis_networkanalysis SHARED ${QGIS_NETWORK_ANALYSIS_SRCS} ${QGIS_NETWORK_ANALYSIS_MOC_SRCS} ${QGIS_NETWORK_ANALYSIS_HDRS})
4646

4747
SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES
48-
VERSION ${COMPLETE_VERSION}
49-
SOVERSION ${COMPLETE_VERSION}
5048
PUBLIC_HEADER "${QGIS_NETWORK_ANALYSIS_HDRS};${QGIS_NETWORK_ANALYSIS_MOC_HDRS}"
5149
CLEAN_DIRECT_OUTPUT 1
5250
FRAMEWORK 1
@@ -55,6 +53,14 @@ SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES
5553
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
5654
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_networkanalysis)
5755

56+
#generate unversioned libs for android
57+
IF (NOT ANDROID)
58+
SET_TARGET_PROPERTIES(qgis_networkanalysis PROPERTIES
59+
VERSION ${COMPLETE_VERSION}
60+
SOVERSION ${COMPLETE_VERSION}
61+
)
62+
ENDIF (NOT ANDROID)
63+
5864
ADD_DEPENDENCIES(qgis_networkanalysis qgis_core)
5965

6066
TARGET_LINK_LIBRARIES(qgis_networkanalysis

‎src/core/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,6 @@ ENDIF (WITH_INTERNAL_SPATIALINDEX)
461461
ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC} ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS})
462462

463463
SET_TARGET_PROPERTIES(qgis_core PROPERTIES
464-
VERSION ${COMPLETE_VERSION}
465-
SOVERSION ${COMPLETE_VERSION}
466464
PUBLIC_HEADER "${QGIS_CORE_HDRS};${QGIS_CORE_MOC_HDRS}"
467465
CLEAN_DIRECT_OUTPUT 1
468466
FRAMEWORK 1
@@ -471,6 +469,14 @@ SET_TARGET_PROPERTIES(qgis_core PROPERTIES
471469
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
472470
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_core)
473471

472+
#generate unversioned libs for android
473+
IF (NOT ANDROID)
474+
SET_TARGET_PROPERTIES(qgis_core PROPERTIES
475+
VERSION ${COMPLETE_VERSION}
476+
SOVERSION ${COMPLETE_VERSION}
477+
)
478+
ENDIF (NOT ANDROID)
479+
474480
# make sure to create qgsversion.h before compiling
475481
ADD_DEPENDENCIES(qgis_core version)
476482

‎src/gui/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,6 @@ ENDIF(MSVC)
239239
ADD_LIBRARY(qgis_gui SHARED ${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS} ${QGIS_GUI_HDRS} ${QGIS_GUI_MOC_HDRS})
240240

241241
SET_TARGET_PROPERTIES(qgis_gui PROPERTIES
242-
VERSION ${COMPLETE_VERSION}
243-
SOVERSION ${COMPLETE_VERSION}
244242
PUBLIC_HEADER "${QGIS_GUI_HDRS};${QGIS_GUI_MOC_HDRS}"
245243
CLEAN_DIRECT_OUTPUT 1
246244
FRAMEWORK 1
@@ -249,6 +247,14 @@ SET_TARGET_PROPERTIES(qgis_gui PROPERTIES
249247
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
250248
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis_gui)
251249

250+
#generate unversioned libs for android
251+
IF (NOT ANDROID)
252+
SET_TARGET_PROPERTIES(qgis_gui PROPERTIES
253+
VERSION ${COMPLETE_VERSION}
254+
SOVERSION ${COMPLETE_VERSION}
255+
)
256+
ENDIF (NOT ANDROID)
257+
252258
# make sure that UI files will be processed first
253259
ADD_DEPENDENCIES(qgis_gui ui)
254260

‎src/providers/grass/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ INCLUDE_DIRECTORIES(
1919
ADD_LIBRARY(qgisgrass SHARED qgsgrass.cpp)
2020

2121
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
22-
VERSION ${COMPLETE_VERSION}
23-
SOVERSION ${COMPLETE_VERSION}
2422
CLEAN_DIRECT_OUTPUT 1
2523
FRAMEWORK 1
2624
FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
@@ -29,6 +27,14 @@ SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
2927
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgisgrass
3028
COMPILE_FLAGS "\"-DGRASS_LIB_EXPORT=${DLLEXPORT}\" \"-DGRASS_EXPORT=${DLLIMPORT}\"" )
3129

30+
#generate unversioned libs for android
31+
IF (NOT ANDROID)
32+
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
33+
VERSION ${COMPLETE_VERSION}
34+
SOVERSION ${COMPLETE_VERSION}
35+
)
36+
ENDIF (NOT ANDROID)
37+
3238
TARGET_LINK_LIBRARIES(qgisgrass
3339
qgis_core
3440
${GRASS_LIBRARY_gis}

‎src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,21 @@ INCLUDE_DIRECTORIES(
2828
ADD_LIBRARY (qgissqlanyconnection SHARED ${SACONN_SRCS})
2929

3030
SET_TARGET_PROPERTIES(qgissqlanyconnection PROPERTIES
31-
VERSION ${COMPLETE_VERSION}
32-
SOVERSION ${COMPLETE_VERSION}
3331
CLEAN_DIRECT_OUTPUT 1
3432
FRAMEWORK 1
3533
FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
3634
MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
3735
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
3836
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgisgrass)
3937

38+
#generate unversioned libs for android
39+
IF (NOT ANDROID)
40+
SET_TARGET_PROPERTIES(qgissqlanyconnection PROPERTIES
41+
VERSION ${COMPLETE_VERSION}
42+
SOVERSION ${COMPLETE_VERSION}
43+
)
44+
ENDIF (NOT ANDROID)
45+
4046
TARGET_LINK_LIBRARIES(qgissqlanyconnection
4147
qgis_core
4248
)

‎src/python/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,16 @@ INCLUDE_DIRECTORIES(
2323
ADD_LIBRARY (qgispython SHARED ${QGISPYTHON_SRCS})
2424

2525
SET_TARGET_PROPERTIES(qgispython PROPERTIES
26-
VERSION ${COMPLETE_VERSION}
27-
SOVERSION ${COMPLETE_VERSION}
2826
CLEAN_DIRECT_OUTPUT 1)
2927

28+
#generate unversioned libs for android
29+
IF (NOT ANDROID)
30+
SET_TARGET_PROPERTIES(qgispython PROPERTIES
31+
VERSION ${COMPLETE_VERSION}
32+
SOVERSION ${COMPLETE_VERSION}
33+
)
34+
ENDIF (NOT ANDROID)
35+
3036
TARGET_LINK_LIBRARIES(qgispython
3137
qgis_core
3238
${PYTHON_LIBRARY}

0 commit comments

Comments
 (0)
Please sign in to comment.