Skip to content

Commit

Permalink
Updates for SIP support from Martin
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@6640 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Feb 20, 2007
1 parent 2d69475 commit aad13d1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion python/configure.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"):
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit aad13d1

Please sign in to comment.