Skip to content

Commit fde3b72

Browse files
author
timlinux
committed
Updates for SIP support from Martin
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6640 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8103b85 commit fde3b72

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/configure.py.in
4141
ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_CORE_MAKEFILE} ${BINDINGS_GUI_MAKEFILE} PRE_BUILD
4242
COMMAND ${PYTHON_EXECUTABLE}
4343
ARGS ${CMAKE_CURRENT_BINARY_DIR}/configure.py
44-
DEPENDS ${QGIS_CORE_LIB} ${QGIS_GUI_LIB})
44+
DEPENDS ${QGIS_CORE_LIB} ${QGIS_GUI_LIB} ${CMAKE_CURRENT_BINARY_DIR}/configure.py)
4545

4646
# Step 3: run make in core and gui subdirs
4747
ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_CORE_LIB} PRE_LINK

python/configure.py.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ src_path = '@CMAKE_SOURCE_DIR@'
88
build_path = '@CMAKE_BINARY_DIR@'
99
python_path = src_path + '/python'
1010
gdal_inc_dir = '@GDAL_INCLUDE_DIR@'
11+
geos_inc_dir = '@GEOS_INCLUDE_DIR@'
1112

1213
# create paths for temporary files if don't exist
1314
if not os.path.isdir("./core"):
@@ -100,7 +101,8 @@ for mk in [ makefile_core, makefile_gui ]:
100101
src_path+"/src/core/spatialindex",
101102
src_path+"/src/core/symbology",
102103
build_path, # qgsconfig.h, qgssvnversion.h
103-
gdal_inc_dir]
104+
gdal_inc_dir,
105+
geos_inc_dir]
104106
mk.extra_cxxflags = ["-DCORE_EXPORT="]
105107

106108
# more settings for gui lib

0 commit comments

Comments
 (0)