Updates for SIP support from Martin

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6640 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: timlinux

python/CMakeLists.txt

@@ -41,7 +41,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/configure.py.in
 ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_CORE_MAKEFILE} ${BINDINGS_GUI_MAKEFILE} PRE_BUILD
                    COMMAND ${PYTHON_EXECUTABLE}
                    ARGS ${CMAKE_CURRENT_BINARY_DIR}/configure.py
-		   DEPENDS ${QGIS_CORE_LIB} ${QGIS_GUI_LIB})
+		   DEPENDS ${QGIS_CORE_LIB} ${QGIS_GUI_LIB} ${CMAKE_CURRENT_BINARY_DIR}/configure.py)
 
 # Step 3: run make in core and gui subdirs
 ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_CORE_LIB} PRE_LINK

python/configure.py.in

@@ -8,6 +8,7 @@ src_path = '@CMAKE_SOURCE_DIR@'
 build_path = '@CMAKE_BINARY_DIR@'
 python_path = src_path + '/python'
 gdal_inc_dir = '@GDAL_INCLUDE_DIR@'
+geos_inc_dir = '@GEOS_INCLUDE_DIR@'
 
 # create paths for temporary files if don't exist
 if not os.path.isdir("./core"):
@@ -100,7 +101,8 @@ for mk in [ makefile_core, makefile_gui ]:
                            src_path+"/src/core/spatialindex",
                            src_path+"/src/core/symbology",
                            build_path, # qgsconfig.h, qgssvnversion.h
-                           gdal_inc_dir]
+                           gdal_inc_dir,
+                           geos_inc_dir]
   mk.extra_cxxflags = ["-DCORE_EXPORT="]
 
 # more settings for gui lib