Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Krita
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tusooa Zhu
Krita
Compare Revisions
master...alvin/qt-use-ext-deps
Source
alvin/qt-use-ext-deps
Select Git revision
...
Target
master
Select Git revision
Compare
Commits (1)
ext_qt: Use external zlib/libpng/libjpeg
· 5b0dcbc1
Alvin Wong
authored
Apr 02, 2019
5b0dcbc1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
3rdparty/ext_jpeg/CMakeLists.txt
3rdparty/ext_jpeg/CMakeLists.txt
+1
-1
3rdparty/ext_png/CMakeLists.txt
3rdparty/ext_png/CMakeLists.txt
+1
-1
3rdparty/ext_qt/CMakeLists.txt
3rdparty/ext_qt/CMakeLists.txt
+4
-2
build-tools/windows/build.cmd
build-tools/windows/build.cmd
+2
-2
No files found.
3rdparty/ext_jpeg/CMakeLists.txt
View file @
5b0dcbc1
...
...
@@ -6,7 +6,7 @@ ExternalProject_Add( ext_jpeg
URL_MD5 7c82f0f6a3130ec06b8a4d0b321cbca3
INSTALL_DIR
${
PREFIX_ext_jpeg
}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=
${
PREFIX_ext_jpeg
}
-DWITH_SIMD=OFF -DCMAKE_BUILD_TYPE=
${
GLOBAL_BUILD_TYPE
}
${
GLOBAL_PROFILE
}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=
${
PREFIX_ext_jpeg
}
-DWITH_SIMD=OFF -D
ENABLE_STATIC=OFF -D
CMAKE_BUILD_TYPE=
${
GLOBAL_BUILD_TYPE
}
${
GLOBAL_PROFILE
}
UPDATE_COMMAND
""
)
...
...
3rdparty/ext_png/CMakeLists.txt
View file @
5b0dcbc1
...
...
@@ -5,7 +5,7 @@ ExternalProject_Add( ext_png
URL_MD5 03fbc5134830240104e96d3cda648e71
INSTALL_DIR
${
PREFIX_ext_png
}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=
${
PREFIX_ext_png
}
-DCMAKE_BUILD_TYPE=
${
GLOBAL_BUILD_TYPE
}
${
GLOBAL_PROFILE
}
-DPNG_TESTS=OFF
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=
${
PREFIX_ext_png
}
-DCMAKE_BUILD_TYPE=
${
GLOBAL_BUILD_TYPE
}
${
GLOBAL_PROFILE
}
-DPNG_
STATIC=OFF -DPNG_
TESTS=OFF
UPDATE_COMMAND
""
)
3rdparty/ext_qt/CMakeLists.txt
View file @
5b0dcbc1
...
...
@@ -11,7 +11,9 @@ if (WIN32)
-skip qtpurchasing -skip qtremoteobjects -skip qtscxml -skip qtserialbus
-skip qtspeech -skip qtvirtualkeyboard
#
-qt-zlib -qt-pcre -qt-libpng -qt-libjpeg
-system-zlib -qt-pcre -system-libpng -system-libjpeg
-I
${
EXTPREFIX_qt
}
/include
-L
${
EXTPREFIX_qt
}
/lib
#
-opensource -confirm-license
#
...
...
@@ -66,7 +68,7 @@ if (WIN32)
# Use a short name to reduce the chance of exceeding path length limit
SOURCE_DIR s
BINARY_DIR b
DEPENDS ext_patch
DEPENDS ext_patch
ext_zlib ext_png ext_jpeg
)
elseif
(
NOT APPLE
)
ExternalProject_Add
(
...
...
build-tools/windows/build.cmd
View file @
5b0dcbc1
...
...
@@ -707,8 +707,8 @@ if errorlevel 1 (
)
echo
.
set
EXT_TARGETS
=
patch
png2ico
zlib
lzma
gettext
qt
boost
eigen3
exiv2
fftw3
ilmbase
set
EXT_TARGETS
=
%EXT_TARGETS%
jpeg
lcms2
ocio
openexr
png
tiff
gsl
vc
libraw
set
EXT_TARGETS
=
patch
png2ico
zlib
lzma
gettext
png
jpeg
qt
boost
eigen3
exiv2
set
EXT_TARGETS
=
%EXT_TARGETS%
fftw3
ilmbase
lcms2
ocio
openexr
tiff
gsl
vc
libraw
set
EXT_TARGETS
=
%EXT_TARGETS%
giflib
freetype
poppler
kwindowsystem
drmingw
gmic
set
EXT_TARGETS
=
%EXT_TARGETS%
python
sip
pyqt
set
EXT_TARGETS
=
%EXT_TARGETS%
quazip
...
...