Skip to content

Commit 6a56cb0

Browse files
jef-njef-n
committed
updates and fixes for windows qt5/py3 build
1 parent ea116fd commit 6a56cb0

File tree

94 files changed

+453
-636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+453
-636
lines changed

‎CMakeLists.txt

+8-7
Original file line numberDiff line numberDiff line change
@@ -569,15 +569,16 @@ IF(COMMAND cmake_policy)
569569
IF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
570570
cmake_policy(SET CMP0063 NEW)
571571
ENDIF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
572+
IF(MSVC)
573+
cmake_policy(SET CMP0020 NEW)
574+
ENDIF(MSVC)
572575
ENDIF(COMMAND cmake_policy)
573576

574-
IF (WIN32)
575-
IF(PEDANTIC AND NOT APPLE)
576-
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
577-
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
578-
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
579-
ENDIF(PEDANTIC AND NOT APPLE)
580-
ENDIF(WIN32)
577+
IF (PEDANTIC AND NOT WIN32 AND NOT APPLE)
578+
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
579+
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
580+
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
581+
ENDIF(PEDANTIC AND NOT WIN32 AND NOT APPLE)
581582

582583
SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
583584
INCLUDE(GenerateExportHeader)

‎cmake/FindProj.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
4141
"$ENV{LIB_DIR}/include"
4242
)
4343

44-
FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i PATHS
44+
FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS
4545
"$ENV{LIB}"
4646
"$ENV{LIB_DIR}/lib"
4747
)

‎cmake/SIPMacros.cmake

-6
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,6 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP CPP_FILES)
9797
ENDIF(MSVC)
9898

9999
SET(SIPCMD ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip})
100-
SET(SUPPRESS_SIP_WARNINGS FALSE CACHE BOOL "Hide SIP warnings")
101-
MARK_AS_ADVANCED(SUPPRESS_SIP_WARNINGS)
102-
IF(SUPPRESS_SIP_WARNINGS)
103-
SET(SIPCMD ${SIPCMD} 2> /dev/null || true)
104-
ENDIF(SUPPRESS_SIP_WARNINGS)
105-
106100
ADD_CUSTOM_COMMAND(
107101
OUTPUT ${_sip_output_files}
108102
COMMAND ${CMAKE_COMMAND} -E echo ${message}

‎ms-windows/osgeo4w/browser-grass.bat.tmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
@echo off
22
call "%~dp0\o4w_env.bat"
33
call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat
4+
call "%~dp0\qt5_env.bat"
5+
call "%~dp0\py3_env.bat"
46
@echo off
57
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\bin;%PATH%
68
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
7-
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins
9+
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins
810
start "QGIS Browser" /B "%OSGEO4W_ROOT%"\bin\@package@-browser-bin.exe %*

‎ms-windows/osgeo4w/browser.bat.tmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
@echo off
22
call "%~dp0\o4w_env.bat"
3+
call "%~dp0\qt5_env.bat"
4+
call "%~dp0\py3_env.bat"
35
@echo off
46
path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH%
57
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
6-
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins
8+
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins
79
start "QGIS Browser" /B "%OSGEO4W_ROOT%"\bin\@package@-browser-bin.exe %*

‎ms-windows/osgeo4w/designer.bat.tmpl

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@echo off
22
call "%~dp0\o4w_env.bat"
3+
call "%~dp0\qt5_env.bat"
34
path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH%
45
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@
5-
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins
6+
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt5\plugins
67
start "Qt Designer with QGIS custom widgets" /B "%OSGEO4W_ROOT%"\bin\designer.exe %*

‎ms-windows/osgeo4w/ninja/ninja.bat

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@echo off
2+
call %OSGEO4W_ROOT%\bin\o4w_env.bat
3+
call py3_env.bat
4+
call qt5_env.bat
5+
call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
6+
path %PATH%;c:\cygwin\bin;c:\program files\cmake\bin
7+
%OSGEO4W_ROOT%\bin\ninja -j4 -C ..\build-qgis-dev-x86_64

‎ms-windows/osgeo4w/ninja/ninja.sln

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ninja", "ninja.vcxproj", "{02B448C7-945C-46D6-954C-AEAE0653BA59}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
RelWithDebInfo|Win32 = RelWithDebInfo|Win32
11+
RelWithDebInfo|x64 = RelWithDebInfo|x64
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{02B448C7-945C-46D6-954C-AEAE0653BA59}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
15+
{02B448C7-945C-46D6-954C-AEAE0653BA59}.RelWithDebInfo|Win32.Build.0 = Release|Win32
16+
{02B448C7-945C-46D6-954C-AEAE0653BA59}.RelWithDebInfo|x64.ActiveCfg = Release|x64
17+
{02B448C7-945C-46D6-954C-AEAE0653BA59}.RelWithDebInfo|x64.Build.0 = Release|x64
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
EndGlobal

‎ms-windows/osgeo4w/ninja/ninja.vcxproj

+108
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGuid>{02B448C7-945C-46D6-954C-AEAE0653BA59}</ProjectGuid>
23+
<Keyword>MakeFileProj</Keyword>
24+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
25+
</PropertyGroup>
26+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
28+
<ConfigurationType>Makefile</ConfigurationType>
29+
<UseDebugLibraries>true</UseDebugLibraries>
30+
<PlatformToolset>v140</PlatformToolset>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
33+
<ConfigurationType>Makefile</ConfigurationType>
34+
<UseDebugLibraries>false</UseDebugLibraries>
35+
<PlatformToolset>v140</PlatformToolset>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
38+
<ConfigurationType>Makefile</ConfigurationType>
39+
<UseDebugLibraries>true</UseDebugLibraries>
40+
<PlatformToolset>v140</PlatformToolset>
41+
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
43+
<ConfigurationType>Makefile</ConfigurationType>
44+
<UseDebugLibraries>false</UseDebugLibraries>
45+
<PlatformToolset>v140</PlatformToolset>
46+
</PropertyGroup>
47+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
48+
<ImportGroup Label="ExtensionSettings">
49+
</ImportGroup>
50+
<ImportGroup Label="Shared">
51+
</ImportGroup>
52+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
53+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
54+
</ImportGroup>
55+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
56+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57+
</ImportGroup>
58+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
59+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60+
</ImportGroup>
61+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
62+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63+
</ImportGroup>
64+
<PropertyGroup Label="UserMacros" />
65+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66+
<NMakeBuildCommandLine>ninja -C ../build-qgis-dev-x86 all</NMakeBuildCommandLine>
67+
<NMakeOutput>..\build-qgis-dev-x86\output\bin\qgis.exe</NMakeOutput>
68+
<NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
69+
<OutDir>..\build-qgis-dev-x86</OutDir>
70+
<IntDir />
71+
<NMakeReBuildCommandLine>ninja -C ../build-qgis-dev-x86 clean all</NMakeReBuildCommandLine>
72+
<NMakeCleanCommandLine>ninja -C ../build-qgis-dev-x86 clean</NMakeCleanCommandLine>
73+
</PropertyGroup>
74+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
75+
<NMakeBuildCommandLine>ninja -C ../build-qgis-dev-x86 all</NMakeBuildCommandLine>
76+
<NMakeOutput>..\build-qgis-dev-x86\output\bin\qgis.exe</NMakeOutput>
77+
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
78+
<OutDir>..\build-qgis-dev-x86</OutDir>
79+
<IntDir />
80+
<NMakeReBuildCommandLine>ninja -C ../build-qgis-dev-x86 clean all</NMakeReBuildCommandLine>
81+
<NMakeCleanCommandLine>ninja -C ../build-qgis-dev-x86 clean</NMakeCleanCommandLine>
82+
</PropertyGroup>
83+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
84+
<NMakeBuildCommandLine>ninja -C ../build-qgis-dev-x86_64 -j4 -k1000 all</NMakeBuildCommandLine>
85+
<NMakeReBuildCommandLine>ninja -C ../build-qgis-dev-x86_64 -j4 -k1000 clean all</NMakeReBuildCommandLine>
86+
<NMakeCleanCommandLine>ninja -C ../build-qgis-dev-x86_64 clean</NMakeCleanCommandLine>
87+
<NMakeOutput>..\build-qgis-dev-x86_64\output\bin\qgis.exe</NMakeOutput>
88+
</PropertyGroup>
89+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
90+
<NMakeBuildCommandLine>ninja -C ../build-qgis-dev-x86_64 -j4 -k1000 all</NMakeBuildCommandLine>
91+
<NMakeReBuildCommandLine>ninja -C ../build-qgis-dev-x86_64 -j4 -k1000 clean all</NMakeReBuildCommandLine>
92+
<NMakeCleanCommandLine>ninja -C ../build-qgis-dev-x86_64 clean</NMakeCleanCommandLine>
93+
<NMakeOutput>..\build-qgis-dev-x86_64\output\bin\qgis.exe</NMakeOutput>
94+
</PropertyGroup>
95+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
96+
<BuildLog>
97+
<Path>x86.log</Path>
98+
</BuildLog>
99+
</ItemDefinitionGroup>
100+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
101+
<BuildLog>
102+
<Path>x86.log</Path>
103+
</BuildLog>
104+
</ItemDefinitionGroup>
105+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
106+
<ImportGroup Label="ExtensionTargets">
107+
</ImportGroup>
108+
</Project>

‎ms-windows/osgeo4w/package-nightly.cmd

+31-27
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ if not exist "%BUILDDIR%" (echo could not create build directory %BUILDDIR% & go
4444

4545
if not exist "%OSGEO4W_ROOT%\bin\o4w_env.bat" (echo o4w_env.bat not found & goto error)
4646
call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
47+
call "%OSGEO4W_ROOT%\bin\py3_env.bat"
48+
call "%OSGEO4W_ROOT%\bin\qt5_env.bat"
4749

4850
set O4W_ROOT=%OSGEO4W_ROOT:\=/%
4951
set LIB_DIR=%O4W_ROOT%
@@ -56,35 +58,33 @@ if "%ARCH%"=="x86" goto cmake_x86
5658
goto cmake_x86_64
5759

5860
:cmake_x86
59-
set GRASS6_VERSION=6.4.4
60-
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
61+
call "%PF86%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
6162
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x86 /Release
62-
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
63-
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 10.0\VC\bin
63+
path %path%;%PF86%\Microsoft Visual Studio 14.0\VC\bin
64+
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 14.0\VC\bin
65+
set SETUPAPI_LIBRARY=c:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x86\SetupAPI.Lib
6466

6567
set CMAKE_OPT=^
66-
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
67-
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib ^
68+
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python36/sip.exe ^
6869
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /MP /Od /D NDEBUG /D QGISDEBUG" ^
6970
-D CMAKE_PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO=%BUILDDIR%\apps\%PACKAGENAME%\pdb ^
7071
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex_i.lib
72+
7173
goto cmake
7274

7375
:cmake_x86_64
74-
set GRASS6_VERSION=6.4.3
75-
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
76+
call "%PF86%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
7677
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x64 /Release
77-
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
78-
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 10.0\VC\bin\amd64
79-
80-
set SETUPAPI_LIBRARY=%PF86%\Microsoft SDKs\Windows\v7.0A\Lib\x64\SetupAPI.Lib
78+
path %path%;%PF86%\Microsoft Visual Studio 14.0\VC\bin
79+
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 14.0\VC\bin\amd64
80+
set SETUPAPI_LIBRARY=c:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x64\SetupAPI.Lib
81+
if not exist "%SETUPAPI_LIBRARY%" set SETUPAPI_LIBRARY=%PF86%\Microsoft SDKs\Windows\v7.0A\Lib\x64\SetupAPI.Lib
8182
if not exist "%SETUPAPI_LIBRARY%" set SETUPAPI_LIBRARY=%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\Lib\x64\SetupAPI.lib
8283
if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
8384

8485
set CMAKE_OPT=^
8586
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
86-
-D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^
87-
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
87+
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python36/sip.exe ^
8888
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /Zi /MP /Od /D NDEBUG /D QGISDEBUG" ^
8989
-D CMAKE_PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO=%BUILDDIR%\apps\%PACKAGENAME%\pdb ^
9090
-D SETUPAPI_LIBRARY="%SETUPAPI_LIBRARY%" ^
@@ -94,10 +94,11 @@ set CMAKE_OPT=^
9494
for /f "usebackq tokens=1" %%a in (`%OSGEO4W_ROOT%\bin\grass72 --config path`) do set GRASS72_PATH=%%a
9595
for %%i in ("%GRASS72_PATH%") do set GRASS72_VERSION=%%~nxi
9696
set GRASS72_VERSION=%GRASS72_VERSION:grass-=%
97-
set GRASS_VERSIONS=%GRASS6_VERSION% %GRASS72_VERSION%
97+
set GRASS_VERSIONS=%GRASS72_VERSION%
9898

9999
set PYTHONPATH=
100-
path %PF86%\CMake\bin;%PATH%;c:\cygwin\bin
100+
if exist "%PF86%\CMake\bin" path %PATH%;c:\cygwin\bin;%PF86%\CMake\bin
101+
if exist "%PROGRAMFILES%\CMake\bin" path %PATH%;c:\cygwin\bin;%PROGRAMFILES%\CMake\bin
101102

102103
PROMPT qgis%VERSION%$g
103104

@@ -158,33 +159,32 @@ cmake -G Ninja ^
158159
-D CMAKE_CXX_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
159160
-D CMAKE_C_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
160161
-D CMAKE_LINKER="%CMAKE_COMPILER_PATH:\=/%/link.exe" ^
161-
-D BUILDNAME="%PACKAGENAME%-%VERSION%%SHA%-Nightly-VC10-%ARCH%" ^
162+
-D BUILDNAME="%PACKAGENAME%-%VERSION%%SHA%-Nightly-VC14-%ARCH%" ^
162163
-D SITE="%SITE%" ^
163164
-D PEDANTIC=TRUE ^
164165
-D WITH_QSPATIALITE=TRUE ^
165166
-D WITH_SERVER=TRUE ^
166167
-D SERVER_SKIP_ECW=TRUE ^
167168
-D WITH_GRASS=TRUE ^
168-
-D WITH_GRASS6=TRUE ^
169+
-D WITH_GRASS6=FALSE ^
169170
-D WITH_GRASS7=TRUE ^
170-
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS6_VERSION% ^
171171
-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
172-
-D WITH_GLOBE=TRUE ^
172+
-D WITH_GLOBE=FALSE ^
173173
-D WITH_TOUCH=TRUE ^
174174
-D WITH_ORACLE=TRUE ^
175+
-D WITH_QTWEBKIT=FALSE ^
175176
-D WITH_CUSTOM_WIDGETS=TRUE ^
176177
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
177178
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
178179
-D GEOS_LIBRARY=%O4W_ROOT%/lib/geos_c.lib ^
179180
-D SQLITE3_LIBRARY=%O4W_ROOT%/lib/sqlite3_i.lib ^
180181
-D SPATIALITE_LIBRARY=%O4W_ROOT%/lib/spatialite_i.lib ^
181-
-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
182-
-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python27/include ^
183-
-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python27/libs/python27.lib ^
182+
-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python3.exe ^
183+
-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python36/include ^
184+
-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python36/libs/python36.lib ^
184185
-D QT_BINARY_DIR=%O4W_ROOT%/bin ^
185186
-D QT_LIBRARY_DIR=%O4W_ROOT%/lib ^
186-
-D QT_HEADERS_DIR=%O4W_ROOT%/include/qt4 ^
187-
-D QWT_INCLUDE_DIR=%O4W_ROOT%/include/qwt ^
187+
-D QT_HEADERS_DIR=%O4W_ROOT%/apps/qt5/include ^
188188
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
189189
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
190190
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
@@ -199,6 +199,10 @@ cmake -G Ninja ^
199199
-D WITH_INTERNAL_MOCK=FALSE ^
200200
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
201201
-D WITH_INTERNAL_FUTURE=FALSE ^
202+
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
203+
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca.lib ^
204+
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
205+
-D SUPPRESS_SIP_WARNINGS=TRUE ^
202206
%CMAKE_OPT% ^
203207
%SRCDIR:\=/%
204208
if errorlevel 1 (echo cmake failed & goto error)
@@ -303,8 +307,8 @@ if not exist %PKGDIR%\qtplugins\designer mkdir %PKGDIR%\qtplugins\designer
303307
move %OSGEO4W_ROOT%\apps\qt4\plugins\designer\qgis_customwidgets.dll %PKGDIR%\qtplugins\designer
304308
if errorlevel 1 (echo move of customwidgets failed & goto error)
305309

306-
if not exist %PKGDIR%\python\PyQt4\uic\widget-plugins mkdir %PKGDIR%\python\PyQt4\uic\widget-plugins
307-
move %OSGEO4W_ROOT%\apps\Python27\Lib\site-packages\PyQt4\uic\widget-plugins\qgis_customwidgets.py %PKGDIR%\python\PyQt4\uic\widget-plugins
310+
if not exist %PKGDIR%\python\PyQt5\uic\widget-plugins mkdir %PKGDIR%\python\PyQt5\uic\widget-plugins
311+
move %OSGEO4W_ROOT%\apps\Python36\Lib\site-packages\PyQt5\uic\widget-plugins\qgis_customwidgets.py %PKGDIR%\python\PyQt5\uic\widget-plugins
308312
if errorlevel 1 (echo move of customwidgets binding failed & goto error)
309313

310314
if not exist %ARCH%\release\qgis\%PACKAGENAME% mkdir %ARCH%\release\qgis\%PACKAGENAME%

0 commit comments

Comments
 (0)