Skip to content
Permalink
Browse files

Conditional use of qtSql lib

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7171 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux
timlinux committed Aug 29, 2007
1 parent f03bfe0 commit d3e6a896bdd12d2ba6a8f9aa8abb5a627017eef8
Showing with 14 additions and 1 deletion.
  1. +6 −0 src/core/CMakeLists.txt
  2. +8 −1 src/gui/CMakeLists.txt
@@ -158,6 +158,12 @@ TARGET_LINK_LIBRARIES(qgis_core
${GDAL_LIBRARY}
${PLATFORM_LIBRARIES}
)
#work aroud for the fact that qt3 support on mac is linked ot qsql
IF (APPLE)
TARGET_LINK_LIBRARIES(qgis_core
${QT_QTSQL_LIBRARY}
)
ENDIF (APPLE)

INSTALL(TARGETS qgis_core
RUNTIME DESTINATION ${QGIS_BIN_DIR}
@@ -61,7 +61,6 @@ ADD_DEPENDENCIES(qgis_gui ui)
TARGET_LINK_LIBRARIES(qgis_gui
${QT_QTGUI_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTSQL_LIBRARY}
${QT_QTSVG_LIBRARY}
${QT_QTNETWORK_LIBRARY}
${QT_QTMAIN_LIBRARY}
@@ -70,6 +69,14 @@ TARGET_LINK_LIBRARIES(qgis_gui
qgis_core
)

#work aroud for the fact that qt3 support on mac is linked ot qsql
IF (APPLE)
TARGET_LINK_LIBRARIES(qgis_gui
${QT_QTSQL_LIBRARY}
)
ENDIF (APPLE)


INSTALL(TARGETS qgis_gui
RUNTIME DESTINATION ${QGIS_BIN_DIR}
LIBRARY DESTINATION lib)

0 comments on commit d3e6a89

Please sign in to comment.
You can’t perform that action at this time.