Skip to content

Commit

Permalink
CMake tweaks to get build working on mac
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6575 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Feb 12, 2007
1 parent 06b941c commit 73e65a6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

PROJECT(qgis)
PROJECT(qgis0.8.1)

# TODO:
# - install includes for libs
Expand Down
1 change: 1 addition & 0 deletions src/gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
${CMAKE_CURRENT_BINARY_DIR}/../../tools/mapserver_export
${GEOS_INCLUDE_DIR}
)

SET(QGIS_APP_SRCS main.cpp)
Expand Down
12 changes: 11 additions & 1 deletion src/providers/wms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,22 @@ ENDIF (NOT WIN32)

QT4_WRAP_CPP (WMS_MOC_SRCS ${WMS_MOC_HDRS})

INCLUDE_DIRECTORIES( . ../../gui ../../raster ../../core ${SQLITE3_INCLUDE_DIR})
INCLUDE_DIRECTORIES(
.
../../gui
../../raster
../../core
${SQLITE3_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
)

ADD_LIBRARY(wmsprovider MODULE ${WMS_SRCS} ${WMS_MOC_SRCS})

TARGET_LINK_LIBRARIES(wmsprovider
${QT_LIBRARIES}
${PROJ_LIBRARIES}
${GDAL_LIBRARIES}
qgis_core
)

Expand Down

0 comments on commit 73e65a6

Please sign in to comment.