Commit fbdce997 authored by Wolthera van Hövell's avatar Wolthera van Hövell 🛍

Merge branch 'master' into krita-testing-wolthera

parents 38398393 6530b6db
......@@ -6,8 +6,6 @@ qtcreator-build
.kateconfig
CMakeLists.txt.user*
.directory
*.rej
*.orig
*.autosave
*.swp
.gdb_history
......
......@@ -52,6 +52,10 @@ if (MSVC)
set(PATCH_COMMAND myptch)
endif()
if (MINGW)
set(PATCH_COMMAND myptch)
endif()
if (MSYS)
set(PATCH_COMMAND patch)
set(GLOBAL_PROFILE ${GLOBAL_PROFILE}
......@@ -80,6 +84,10 @@ if (MSVC)
add_subdirectory( ext_patch )
add_subdirectory( ext_png2ico )
endif (MSVC)
if (MINGW)
add_subdirectory( ext_patch )
add_subdirectory( ext_png2ico )
endif (MINGW)
add_subdirectory( ext_iconv )
add_subdirectory( ext_gettext )
add_subdirectory( ext_zlib )
......@@ -99,14 +107,11 @@ add_subdirectory( ext_vc )
add_subdirectory( ext_gsl )
add_subdirectory( ext_fftw3 )
add_subdirectory( ext_ocio )
add_subdirectory( ext_openjpeg )
if (MSVC)
add_subdirectory( ext_pthreads )
endif (MSVC)
add_subdirectory( ext_freetype)
if (LINUX)
add_subdirectory( ext_fontconfig)
endif()
add_subdirectory( ext_freetype)
add_subdirectory( ext_qt )
add_subdirectory( ext_poppler )
add_subdirectory( ext_libraw )
......
......@@ -25,8 +25,8 @@ Note: on all operating systems the entire procedure is done in a terminal window
3. Make sure you have a compiler:
* Linux: gcc, minimum version 4.8
* OSX: clang, you need to install xcode for this
* Windows: MSVC 2015 Community Edition: https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx
4. If you compile Qt on Windows, you will also need Python 2.7: https://www.python.org/download/releases/2.7/. Make sure to have python.exe in you path.
* Windows: (http://tdm-gcc.tdragon.net/, version 5.1). MSVC cannot build G'Mic correctly. For some reason, cmake wants to use nmake even when using mingw, so copy mingw32-make.exe to nmake.exe. And remember to install the OpenMP plugin in tdm-gcc.
4. If you compile Qt on Windows, you will also need Python 2.7: https://www.python.org/download/releases/2.7/. Make sure to have python.exe in your path.
== Setup your environment ==
......@@ -47,145 +47,52 @@ Windows Only:
5. Create the install directory
mkdir BUILDROOT/i
== Qt ==
Install Qt. You have three options:
* build from source yourself
* install with the qt.io installer.
* build using the krita/3rdparty/ext_qt project as detailed in the next section.
Either way, make sure qmake is in your environment path. If you are using Qt 5.6 for example, this is the default location for Windows:
C:\Qt\Qt5.6.0\5.6\msvc2015_64\bin, when using the qt.io installer.
When building from source, you need the following modules:
* qtbase
* qtdeclarative
* qtimageformats
* qtscript
* qtscript
* qtsvg
* qttools
* qttranslations
On Windows, you also need qtwinextras, on Linux qtx11extras, on OSX qtmacextras.
When installing from source, you can use these example configure commands:
* Linux:
./configure \
-skip qt3d \
-skip qtactiveqt \
-skip qtcanvas3d \
-skip qtconnectivity \
-skip qtdoc \
-skip qtenginio \
-skip qtgraphicaleffects \
-skip qtlocation \
-skip qtmultimedia \
-skip qtsensors \
-skip qtserialport \
-skip qtwayland \
-skip qtwebchannel \
-skip qtwebengine \
-skip qtwebkit \
-skip qtwebkit-examples \
-skip qtwebsockets \
-skip qtxmlpatterns \
-opensource -confirm-license -release \
-no-qml-debug -no-mtdev -no-journald \
-no-openssl -no-libproxy \
-no-pulseaudio -no-alsa -no-nis \
-no-cups -no-tslib -no-pch \
-no-dbus -no-gstreamer -no-system-proxies \
-no-openssl -no-libproxy -no-pulseaudio \
-qt-xcb -xcb -qt-freetype -qt-harfbuzz \
-qt-pcre -qt-xkbcommon-x11 -xcb-xlib \
-prefix BUILDROOT/i
make -j8
* OSX
./configure \
-skip qt3d \
-skip qtactiveqt \
-skip qtcanvas3d \
-skip qtconnectivity \
-skip qtdoc \
-skip qtenginio \
-skip qtgraphicaleffects \
-skip qtlocation \
-skip qtmultimedia \
-skip qtsensors \
-skip qtserialport \
-skip qtwayland \
-skip qtwebchannel \
-skip qtwebengine \
-skip qtwebsockets \
-skip qtxmlpatterns \
-opensource -confirm-license -release \
-no-qml-debug -no-mtdev -no-journald \
-no-openssl -no-libproxy \
-no-pulseaudio -no-alsa -no-nis \
-no-cups -no-tslib -no-pch \
-no-dbus -no-gstreamer -no-system-proxies \
-no-openssl -no-libproxy -no-pulseaudio \
-nomake examples -nomake tests \
-prefix $BUILDROOT/i
* Windows
To do a normal release build use:
configure -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdoc -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtmultimedia -skip qtsensors -skip qtserialport -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -no-sql-sqlite -nomake examples -nomake tools -no-compile-examples -no-dbus -no-iconv -no-angle -no-ssl -no-openssl -no-wmf-backend -no-qml-debug -no-libproxy -no-system-proxies -no-nis -no-icu -no-mtdev -opensource -confirm-license -release -opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -prefix %BUILDROOT%\i
If a release with debug info for developing purposes is needed, add the -force-debug-info to the configure options above, so that the pdb files will be generated.
N.B.: if you don't have the Qt 5.6 pre-built binaries already
installed, you will need to copy Qt5Core.dll, coming from those
binaries inside the Qt build directory, under the path qtbase\bin,
otherwise you'll get an error about it missing when using jom
and a more cryptic error with nmake. The same has to be done with
Qt5Xml.dll, to be copied under qttools\bin. Don't use the dlls
coming from the QtCreator folder, they won't work.
== Prepare the externals build ==
1. enter the BUILDROOT/b directory
2. run cmake:
* Linux:
cmake ../krita/3rdparty -DINSTALL_ROOT=BUILDROOT/i -DEXTERNALS_DOWNLOAD_DIR=BUILDROOT/d -DCMAKE_INSTALL_PREFIX=BUILDROOT/i
:
export PATH=$BUILDROOT/i/bin
cmake ../krita/3rdparty \
-DINSTALL_ROOT=$BUILDROOT/i \
-DEXTERNALS_DOWNLOAD_DIR=$BUILDROOT/d \
-DCMAKE_INSTALL_PREFIX=BUILDROOT/i
* OSX:
export PATH=$BUILDROOT/i/bin
cmake ../krita/3rdparty/ \
-DCMAKE_INSTALL_PREFIX=$BUILDROOT/i \
-DEXTERNALS_DOWNLOAD_DIR=$BUILDROOT/d \
-DINSTALL_ROOT=$BUILDROOT/i
* Windows 32 bits:
TODO
* Windows 64 bits:
Note that the cmake command needs to point to your BUILDROOT like /dev/d, not c:\dev\d.
set PATH=BUILDROOT\i\bin\;BUILDROOT\i\lib;%PATH%
cmake ..\krita\3rdparty -DEXTERNALS_DOWNLOAD_DIR=/dev/d -DINSTALL_ROOT=/dev/i -G "Visual Studio 14 Win64"
cmake ..\krita\3rdparty -DEXTERNALS_DOWNLOAD_DIR=/dev/d -DINSTALL_ROOT=/dev/i -G "MinGW Makefiles"
3. build the packages:
With a judicious application of DEPENDS statements, it's possible to build it all in one go, but in my experience that fails anyway, so it's better to build the dependencies indepdendently.
With a judicious application of DEPENDS statements, it's possible to build it all in one go, but in my experience that fails always, so it's better to build the dependencies independently.
On Windows:
cmake --build . --config RelWithDebInfo --target ext_patch
cmake --build . --config RelWithDebInfo --target ext_png2ico
cmake --build . --config RelWithDebInfo --target ext_pthreads
On all operation systems, if you have decided to build Qt using the ext_qt project:
cmake --build . --config RelWithDebInfo --target ext_qt
cmake --build . --config RelWithDebInfo --target ext_gettext
On all operating systems:
cmake --build . --config RelWithDebInfo --target ext_qt
cmake --build . --config RelWithDebInfo --target ext_zlib
cmake --build . --config RelWithDebInfo --target ext_boost
cmake --build . --config RelWithDebInfo --target ext_eigen3
cmake --build . --config RelWithDebInfo --target ext_exiv2
......@@ -210,11 +117,10 @@ On All operating systems:
cmake --build . --config RelWithDebInfo --target ext_gsl
cmake --build . --config RelWithDebInfo --target ext_vc
cmake --build . --config RelWithDebInfo --target ext_libraw
cmake --build . --config RelWithDebInfo --target ext_openjpeg
On Windows and OSX
cmake --build . --config RelWithDebInfo --target ext_kwindowsystem
cmake --build . --config RelWithDebInfo --target ext_kcrash
On Windows
......@@ -244,17 +150,17 @@ Note 2: libcurl still isn't available.
On Windows
Depending on what you want to use, run this command for MSBuild:
Depending on what you want to use, run this command for MSBuild:
cmake ..\krita -G "Visual Studio 14 Win64" -DBoost_DEBUG=OFF -DBOOST_INCLUDEDIR=c:\dev\i\include -DBOOST_DEBUG=ON -DBOOST_ROOT=c:\dev\i -DBOOST_LIBRARYDIR=c:\dev\i\lib -DCMAKE_INSTALL_PREFIX=c:\dev\i -DCMAKE_PREFIX_PATH=c:\dev\i -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DHAVE_MEMORY_LEAK_TRACKER=OFF -DPACKAGERS_BUILD=ON -Wno-dev -DDEFINE_NO_DEPRECATED=1
Or this to later use jom (faster compiling, uses all cores, ships with QtCreator/pre-built Qt binaries):
Or this to use jom (faster compiling, uses all cores, ships with QtCreator/pre-built Qt binaries):
cmake ..\krita -G "NMake Makefiles" -DBoost_DEBUG=OFF -DBOOST_INCLUDEDIR=c:\dev\i\include -DBOOST_DEBUG=ON -DBOOST_ROOT=c:\dev\i -DBOOST_LIBRARYDIR=c:\dev\i\lib -DCMAKE_INSTALL_PREFIX=c:\dev\i -DCMAKE_PREFIX_PATH=c:\dev\i -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DHAVE_MEMORY_LEAK_TRACKER=OFF -DPACKAGERS_BUILD=ON -Wno-dev -DDEFINE_NO_DEPRECATED=1
On Linux
cmake ../krita -DCMAKE_INSTALL_PREFIX=BUILDROOT/i -DDEFINE_NO_DEPRECATED=1 -DPACKAGERS_BUILD=ON -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo
cmake ../krita -DCMAKE_INSTALL_PREFIX=BUILDROOT/i -DDEFINE_NO_DEPRECATED=1 -DPACKAGERS_BUILD=ON -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfobg
On OSX
......@@ -264,10 +170,12 @@ On OSX
4. Run
On Linux and OSX
make
make install
On Windows
Either use MSBuild to build (-- /m tells msbuild to use all your cores):
cmake --build . --config RelWithDebInfo --target INSTALL -- /m
......@@ -292,11 +200,13 @@ On OSX
BUILDROOT/i/bin/krita.app/Contents/MacOS/krita
== Packaging a Windows Build ==
If you want to create a stripped down version of Krita to distribute, after building everything just copy the makepkg.bat file from the "windows" folder inside krita root source folder to BUILDROOT and run it.
That will copy the Krita necessary files into the specified folder and leave behind developer related files, so the resulting folder will be a smaller install folder.
That will copy the necessary files into the specified folder and leave behind developer related files, so the resulting folder will be a smaller install folder.
== Common Issues ==
- On Windows, if you get a 'mspdb140.dll' missing alert window, it means you did not run the bat file. Make sure to include the quotes in the command:
"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
......
......@@ -4,8 +4,8 @@ if (MSVC)
ExternalProject_Add(
ext_boost
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/boost_1_55_0.zip
URL_MD5 8aca361a4713a1f491b0a5e33fee0f1f
URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.zip
URL_MD5 015ae4afa6f3e597232bfe1dab949ace
CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.bat --prefix=${PREFIX_ext_boost}
BUILD_COMMAND <SOURCE_DIR>/b2.exe --with-system --build-dir=build-dir --prefix=${PREFIX_ext_boost} toolset=msvc-14.0 variant=release link=shared threading=multi architecture=x86 address-model=64 variant=release install
......@@ -22,13 +22,14 @@ if (MSVC)
COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_boost}/lib/boost_system-vc140-mt-1_55.dll ${PREFIX_ext_boost}/bin/boost_system-vc140-mt-1_55.dll
DEPENDEES install
)
else()
ExternalProject_Add(
ext_boost
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/boost_1_55_0.zip
URL_MD5 8aca361a4713a1f491b0a5e33fee0f1f
URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.zip
URL_MD5 015ae4afa6f3e597232bfe1dab949ace
CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.bat --prefix=${PREFIX_ext_boost}
BUILD_COMMAND <SOURCE_DIR>/b2.exe --with-system --build-dir=build-dir --prefix=${PREFIX_ext_boost} toolset=msvc-14.0 variant=release link=shared threading=multi architecture=x86 variant=release install
......@@ -46,11 +47,34 @@ if (MSVC)
DEPENDEES install
)
endif()
elseif(MINGW)
ExternalProject_Add(
ext_boost
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.zip
URL_MD5 015ae4afa6f3e597232bfe1dab949ace
CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.bat mingw --prefix=${PREFIX_ext_boost}
BUILD_COMMAND <SOURCE_DIR>/b2.exe --with-system --build-dir=build-dir --prefix=${PREFIX_ext_boost} toolset=gcc variant=release link=shared threading=multi architecture=x86 variant=release install
INSTALL_COMMAND ""
INSTALL_DIR ${EXTPREFIX_boost}
UPDATE_COMMAND ""
ALWAYS 0
BUILD_IN_SOURCE 1
)
ExternalProject_Add_Step(
ext_boost
post_install
COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_boost}/lib/libboost_system-mgw51-mt-1_55.dll ${PREFIX_ext_boost}/bin/
DEPENDEES install
)
else()
ExternalProject_Add( ext_boost
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/boost_1_55_0.tar.bz2
URL_MD5 d6eef4b4cacb2183f2bf265a5a03a354
URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.tar.bz2
URL_MD5 6095876341956f65f9d35939ccea1a9f
CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.sh --prefix=${PREFIX_ext_boost} --with-libraries=system
BUILD_COMMAND <SOURCE_DIR>/b2 install
......
SET(EXTPREFIX_eigen3 "${EXTPREFIX}" )
ExternalProject_Add( ext_eigen3
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/eigen3-3.2.6.tar.gz
URL_MD5 9f93bfc14ba0816220c9674e99b8c418
URL http://files.kde.org/krita/build/dependencies/eigen-eigen-07105f7124f9.tar.gz
URL_MD5 135d8d43aaee5fb54cf5f3e981b1a6db
INSTALL_DIR ${EXTPREFIX_eigen3}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/dart.diff
......
diff --git a/cmake/EigenConfigureTesting.cmake b/cmake/EigenConfigureTesting.cmake
index 11ecc95..f7f8b34 100644
index 2b11d83..8cf56ff 100644
--- a/cmake/EigenConfigureTesting.cmake
+++ b/cmake/EigenConfigureTesting.cmake
@@ -41,7 +41,7 @@ endif()
@@ -26,19 +26,6 @@ include(CTest)
# copy ctest properties, which currently
# o raise the warning levels
-configure_file(${CMAKE_CURRENT_BINARY_DIR}/DartConfiguration.tcl ${CMAKE_BINARY_DIR}/DartConfiguration.tcl)
+#configure_file(${CMAKE_CURRENT_BINARY_DIR}/DartConfiguration.tcl ${CMAKE_BINARY_DIR}/DartConfiguration.tcl)
set(EIGEN_TEST_BUILD_FLAGS " " CACHE STRING "Options passed to the build command of unit tests")
# restore default CMAKE_MAKE_PROGRAM
set(CMAKE_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM_SAVE})
-# Overwrite default DartConfiguration.tcl such that ctest can build our unit tests.
-# Recall that our unit tests are not in the "all" target, so we have to explicitely ask ctest to build our custom 'buildtests' target.
-# At this stage, we can also add custom flags to the build tool through the user defined EIGEN_TEST_BUILD_FLAGS variable.
-file(READ "${CMAKE_CURRENT_BINARY_DIR}/DartConfiguration.tcl" EIGEN_DART_CONFIG_FILE)
-# try to grab the default flags
-string(REGEX MATCH "MakeCommand:.*-- (.*)\nDefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE})
-if(NOT CMAKE_MATCH_1)
-string(REGEX MATCH "MakeCommand:.*[^c]make (.*)\nDefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE})
-endif()
-string(REGEX REPLACE "MakeCommand:.*DefaultCTestConfigurationType" "MakeCommand: ${CMAKE_COMMAND} --build . --target buildtests --config \"\${CTEST_CONFIGURATION_TYPE}\" -- ${CMAKE_MATCH_1} ${EIGEN_TEST_BUILD_FLAGS}\nDefaultCTestConfigurationType"
- EIGEN_DART_CONFIG_FILE2 ${EIGEN_DART_CONFIG_FILE})
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/DartConfiguration.tcl" ${EIGEN_DART_CONFIG_FILE2})
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake.in ${CMAKE_BINARY_DIR}/CTestCustom.cmake)
# some documentation of this function would be nice
......@@ -6,6 +6,7 @@ ExternalProject_Add( ext_exiv2
URL_MD5 258d4831b30f75a01e0234065c6c2806
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/tzname.patch
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch_mingw.patch
INSTALL_DIR ${PREFIX_ext_exiv2}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_exiv2} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DEXIV2_ENABLE_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_BUILD_PO=OFF -DEXIV2_ENABLE_NLS=OFF -DICONV_INCLUDE_DIR=${PREFIX_ext_exiv2}/include
......
diff a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -291,6 +291,9 @@ IF (CYGWIN OR MINGW)
TARGET_LINK_LIBRARIES( exiv2lib psapi )
ENDIF(CYGWIN OR MINGW)
+IF (MINGW)
+ TARGET_LINK_LIBRARIES( exiv2lib ws2_32 )
+ENDIF(MINGW)
INSTALL( TARGETS exiv2lib ${INSTALL_TARGET_STANDARD_ARGS} )
diff a/src/http.cpp b/src/http.cpp
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -53,7 +53,7 @@
#include <string.h>
#include <windows.h>
#include <io.h>
-#ifndef __MINGW__
+#if !defined(__MINGW__) && !defined(__MINGW32__) && !defined(__MINGW64__)
#define snprintf sprintf_s
#define write _write
#define read _read
SET(PREFIX_ext_expat "${EXTPREFIX}" )
if (MSVC)
if (WIN32)
ExternalProject_Add( ext_expat
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/expat-2.1.0.tar.gz
......
......@@ -33,7 +33,23 @@ if (MSVC)
ALWAYS 0
)
endif()
else (MSVC)
elseif (MINGW)
ExternalProject_Add( ext_fftw3
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/fftw-3.3.4-dll64.zip
URL_MD5 c4ec1e6d84e7a8b1cd61121d11d44ee4
INSTALL_DIR ${PREFIX_ext_fftw3}
CONFIGURE_COMMAND ""
BUILD_COMMAND ${CMAKE_COMMAND} -E echo deploying fftw3 64 binary
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/bin ${PREFIX_ext_fftw3}/bin
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/lib ${PREFIX_ext_fftw3}/lib
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${PREFIX_ext_fftw3}/include
UPDATE_COMMAND ""
ALWAYS 0
)
else ()
ExternalProject_Add( ext_fftw3
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/fftw-3.3.4.tar.gz
......@@ -47,4 +63,4 @@ ExternalProject_Add( ext_fftw3
UPDATE_COMMAND ""
ALWAYS 0
)
endif (MSVC)
endif ()
SET(PREFIX_ext_fontconfig "${EXTPREFIX}" )
ExternalProject_Add( ext_fontconfig
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/fontconfig-2.11.94.tar.gz
URL_MD5 479be870c7f83f15f87bac085b61d641
URL http://files.kde.org/krita/build/dependencies/fontconfig-2.12.0.tar.gz
URL_MD5 d8b056231abcb6257db6dc6d745360b2
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_fontconfig} ${GLOBAL_AUTOMAKE_PROFILE}
BUILD_COMMAND make
......
......@@ -18,8 +18,9 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
ExternalProject_Add(
ext_extra_cmake_modules
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/extra-cmake-modules-5.17.0.zip
URL_MD5 c302bb1771b7c366c6eeebf3742b2f54
URL http://download.kde.org/stable/frameworks/5.24/extra-cmake-modules-5.24.0.zip
URL_MD5 e0c19ba97ebd964f9bdc9110c64ce96a
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ecm_install_to_share.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -34,8 +35,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_karchive
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/karchive-5.17.0.zip
URL_MD5 d6bf0fcb6dbcffe1328b75f427593fd0
URL http://download.kde.org/stable/frameworks/5.24/karchive-5.24.0.zip
URL_MD5 739843accfe9bd85ab2f1582722cf01e
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -51,8 +52,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kconfig
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kconfig-5.17.0.zip
URL_MD5 f321e98ce591fdb3632e04c770a5b0c6
URL http://download.kde.org/stable/frameworks/5.24/kconfig-5.24.0.zip
URL_MD5 f87ecff795eb76e4ec6561758a5baf87
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kconfig.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -69,8 +70,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwidgetsaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kwidgetsaddons-5.17.0.zip
URL_MD5 bd32206b1973a3a13e7c405f135479c7
URL http://download.kde.org/stable/frameworks/5.24/kwidgetsaddons-5.24.0.zip
URL_MD5 0e399b427814a4814c65a3cf407f9d79
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwidgetsaddons.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -87,8 +88,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcompletion
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kcompletion-5.17.0.zip
URL_MD5 f853f34a8bb8433ced2d7c46148361ce
URL http://download.kde.org/stable/frameworks/5.24/kcompletion-5.24.0.zip
URL_MD5 e8764251ab45005aa81dba242852300c
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -104,8 +105,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcoreaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kcoreaddons-5.17.0.zip