|
|
@@ -172,7 +172,6 @@ cmake -G Ninja ^ |
|
|
-D WITH_GLOBE=FALSE ^ |
|
|
-D WITH_TOUCH=TRUE ^ |
|
|
-D WITH_ORACLE=TRUE ^ |
|
|
-D WITH_QTWEBKIT=FALSE ^ |
|
|
-D WITH_CUSTOM_WIDGETS=TRUE ^ |
|
|
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^ |
|
|
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^ |
|
|
@@ -199,6 +198,7 @@ cmake -G Ninja ^ |
|
|
-D WITH_INTERNAL_MOCK=FALSE ^ |
|
|
-D WITH_INTERNAL_HTTPLIB2=FALSE ^ |
|
|
-D WITH_INTERNAL_FUTURE=FALSE ^ |
|
|
-D WITH_INTERNAL_PYSPATIALITE=TRUE ^ |
|
|
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^ |
|
|
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^ |
|
|
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^ |
|
|
@@ -298,13 +298,13 @@ move %PKGDIR%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe |
|
|
if errorlevel 1 (echo move of browser executable failed & goto error) |
|
|
|
|
|
if not exist %PKGDIR%\qtplugins\sqldrivers mkdir %PKGDIR%\qtplugins\sqldrivers |
|
|
move %OSGEO4W_ROOT%\apps\qt4\plugins\sqldrivers\qsqlocispatial.dll %PKGDIR%\qtplugins\sqldrivers |
|
|
move %OSGEO4W_ROOT%\apps\qt5\plugins\sqldrivers\qsqlocispatial.dll %PKGDIR%\qtplugins\sqldrivers |
|
|
if errorlevel 1 (echo move of oci sqldriver failed & goto error) |
|
|
move %OSGEO4W_ROOT%\apps\qt4\plugins\sqldrivers\qsqlspatialite.dll %PKGDIR%\qtplugins\sqldrivers |
|
|
move %OSGEO4W_ROOT%\apps\qt5\plugins\sqldrivers\qsqlspatialite.dll %PKGDIR%\qtplugins\sqldrivers |
|
|
if errorlevel 1 (echo move of spatialite sqldriver failed & goto error) |
|
|
|
|
|
if not exist %PKGDIR%\qtplugins\designer mkdir %PKGDIR%\qtplugins\designer |
|
|
move %OSGEO4W_ROOT%\apps\qt4\plugins\designer\qgis_customwidgets.dll %PKGDIR%\qtplugins\designer |
|
|
move %OSGEO4W_ROOT%\apps\qt5\plugins\designer\qgis_customwidgets.dll %PKGDIR%\qtplugins\designer |
|
|
if errorlevel 1 (echo move of customwidgets failed & goto error) |
|
|
|
|
|
if not exist %PKGDIR%\python\PyQt5\uic\widget-plugins mkdir %PKGDIR%\python\PyQt5\uic\widget-plugins |
|
|
|
