Skip to content

Commit d3e6a89

Browse files
author
timlinux
committed
Conditional use of qtSql lib
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7171 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent f03bfe0 commit d3e6a89

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

src/core/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,12 @@ TARGET_LINK_LIBRARIES(qgis_core
158158
${GDAL_LIBRARY}
159159
${PLATFORM_LIBRARIES}
160160
)
161+
#work aroud for the fact that qt3 support on mac is linked ot qsql
162+
IF (APPLE)
163+
TARGET_LINK_LIBRARIES(qgis_core
164+
${QT_QTSQL_LIBRARY}
165+
)
166+
ENDIF (APPLE)
161167

162168
INSTALL(TARGETS qgis_core
163169
RUNTIME DESTINATION ${QGIS_BIN_DIR}

src/gui/CMakeLists.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ ADD_DEPENDENCIES(qgis_gui ui)
6161
TARGET_LINK_LIBRARIES(qgis_gui
6262
${QT_QTGUI_LIBRARY}
6363
${QT_QTXML_LIBRARY}
64-
${QT_QTSQL_LIBRARY}
6564
${QT_QTSVG_LIBRARY}
6665
${QT_QTNETWORK_LIBRARY}
6766
${QT_QTMAIN_LIBRARY}
@@ -70,6 +69,14 @@ TARGET_LINK_LIBRARIES(qgis_gui
7069
qgis_core
7170
)
7271

72+
#work aroud for the fact that qt3 support on mac is linked ot qsql
73+
IF (APPLE)
74+
TARGET_LINK_LIBRARIES(qgis_gui
75+
${QT_QTSQL_LIBRARY}
76+
)
77+
ENDIF (APPLE)
78+
79+
7380
INSTALL(TARGETS qgis_gui
7481
RUNTIME DESTINATION ${QGIS_BIN_DIR}
7582
LIBRARY DESTINATION lib)

0 commit comments

Comments
 (0)