sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Try fixing QScintilla path

Browse Source
This commit is contained in:
Nyall Dawson 2022-08-16 15:27:07 +10:00
parent 2711a77fca
commit 1bb105106f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.docker/docker-qgis-build.sh
View File

@ -66,6 +66,13 @@ if [[ ${PATCH_QT_3D} == "true" ]]; then
) )
fi fi
if [[ ${BUILD_WITH_QT6} = "ON" ]]; then
CMAKE_EXTRA_ARGS+=(
"-DQSCINTILLA_INCLUDE_DIR:STRING=/usr/include/qt6"
"-DQSCINTILLA_LIBRARY:STRING=/usr/lib64/libqscintilla2_qt6.so"
)
fi
if [[ ${WITH_GRASS7} == "ON" || ${WITH_GRASS8} == "ON" ]]; then if [[ ${WITH_GRASS7} == "ON" || ${WITH_GRASS8} == "ON" ]]; then
CMAKE_EXTRA_ARGS+=( CMAKE_EXTRA_ARGS+=(
"-DGRASS_PREFIX$( grass --config version | cut -b 1 )=$( grass --config path )" "-DGRASS_PREFIX$( grass --config version | cut -b 1 )=$( grass --config path )"

8
.docker/qgis3-qt6-build-deps.dockerfile
View File

@ -87,10 +87,10 @@ RUN cd /usr/src \
RUN cd /usr/src \ RUN cd /usr/src \
&& wget https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.0/QScintilla_src-2.13.0.zip \ && wget https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.3/QScintilla_src-2.13.3.zip \
&& unzip QScintilla_src-2.13.0.zip \ && unzip QScintilla_src-2.13.3.zip \
&& rm QScintilla_src-2.13.0.zip \ && rm QScintilla_src-2.13.3.zip \
&& cd QScintilla_src-2.13.0 \ && cd QScintilla_src-2.13.3 \
&& qmake6 src/qscintilla.pro \ && qmake6 src/qscintilla.pro \
&& make -j4 \ && make -j4 \
&& make install && make install