Skip to content

Commit 11060d2

Browse files
committed
osgeo4w update: build with Python 2.7
1 parent 4296e12 commit 11060d2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ms-windows/osgeo4w/package.cmd

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ cmake -G "Visual Studio 9 2008" ^
9696
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
9797
-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^
9898
-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
99-
-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python25/include ^
100-
-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python25/libs/python25.lib ^
101-
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python25/sip.exe ^
99+
-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python27/include ^
100+
-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python27/libs/python27.lib ^
101+
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
102102
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS_VERSION% ^
103103
-D QT_BINARY_DIR=%O4W_ROOT%/bin ^
104104
-D QT_LIBRARY_DIR=%O4W_ROOT%/lib ^

src/core/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC
324324
SET_TARGET_PROPERTIES(qgis_core PROPERTIES VERSION ${COMPLETE_VERSION} SOVERSION ${COMPLETE_VERSION})
325325

326326
# make sure to create qgssvnversion.h before compiling
327-
ADD_DEPENDENCIES(qgis_core svnversion)
327+
ADD_DEPENDENCIES(qgis_core version)
328328

329329
# because of htonl
330330
IF (WIN32)

0 commit comments

Comments
 (0)