CMake tweaks to get build working on mac

git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6575 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 12, 2007 · 73e65a6 · 73e65a6
1 parent 06b941c
commit 73e65a6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-PROJECT(qgis)
+PROJECT(qgis0.8.1)
 
 # TODO:
 # - install includes for libs

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -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)

diff --git a/src/providers/wms/CMakeLists.txt b/src/providers/wms/CMakeLists.txt
@@ -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
 )