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 )
......
This diff is collapsed.
......@@ -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
URL_MD5 75145cb1bc3a78fe4f13ce4383e76947
URL http://download.kde.org/stable/frameworks/5.24/kcoreaddons-5.24.0.zip
URL_MD5 2885878625b19ad0300ef3770b897112
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktoptojson.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -122,8 +123,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kguiaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kguiaddons-5.17.0.zip
URL_MD5 43b49b25d3ee9025d7172033d255e3b5
URL http://download.kde.org/stable/frameworks/5.24/kguiaddons-5.24.0.zip
URL_MD5 9bdadbc57d0634816ef80ee9798c3d6c
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -139,8 +140,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_ki18n
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/ki18n-5.17.0.zip
URL_MD5 7d60380d09f98defbf878ea9daba0fbb
URL http://download.kde.org/stable/frameworks/5.24/ki18n-5.24.0.zip
URL_MD5 5724e8af1c1edc9ad24a17a0d94d80c8
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n.diff
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff
......@@ -158,8 +159,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kitemmodels
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kitemmodels-5.17.0.zip
URL_MD5 708504fd52db768093baac3666503bc3
URL http://download.kde.org/stable/frameworks/5.24/kitemmodels-5.24.0.zip
URL_MD5 ff41589f48395fc01d5fc7887593779d
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -174,8 +175,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kitemviews
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kitemviews-5.17.0.zip
URL_MD5 9280c5e7e669cd6241b62c5a6958202d
URL http://download.kde.org/stable/frameworks/5.24/kitemviews-5.24.0.zip
URL_MD5 33f638d027a3011a6a69f7484eee3287
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -190,8 +191,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kimageformats
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kimageformats-02-02-2016.tgz
URL_MD5 09a923703832181455bc61d67c692040
URL http://download.kde.org/stable/frameworks/5.24/kimageformats-5.24.0.zip
URL_MD5 c1964516bcb2bfe882858f0c0913deb5
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kimageformats.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -207,8 +208,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwindowsystem
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kwindowsystem-5.17.0.zip
URL_MD5 990c241d7fa88774ccd5176ec6bdcbdc
URL http://download.kde.org/stable/frameworks/5.24/kwindowsystem-5.24.0.zip
URL_MD5 5915e4f63ded983af6db7db3a6cbae1a
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwindowsystem-x11.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -221,13 +222,11 @@ ExternalProject_Add(
DEPENDS ext_kimageformats
)
if (LINUX)
ExternalProject_Add(
ext_kcrash
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/kcrash-5.17.0.zip
URL_MD5 b6b865aff352d697928a9165c6564f8f
URL http://download.kde.org/stable/frameworks/5.24/kcrash-5.24.0.zip
URL_MD5 a2e41e6650105fc3ac8fbd44afbae4fe
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -238,4 +237,3 @@ ExternalProject_Add(
ALWAYS 0
DEPENDS ext_kwindowsystem
)
endif()
commit a4170399404bf32e874e35d35f8a66703b2fff92
Author: Boudewijn Rempt <boud@valdyas.org>
Date: Sat Jul 30 14:33:10 2016 +0200
Revert "Use "${BIN_INSTALL_DIR}/data" for DATAROOTDIR on Windows."
This reverts commit 2503481e4537b88d76b4a596f519cb3311e1ca2a.
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index e84c0b3..1773706 100644
--- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake
@@ -489,15 +489,10 @@ _define_absolute(SHAREDSTATEDIR "com"
-if (WIN32)
- _define_relative(DATAROOTDIR BINDIR "data"
- "read-only architecture-independent data root"
- SHARE_INSTALL_PREFIX)
-else()
- _define_absolute(DATAROOTDIR "share"
- "read-only architecture-independent data root"
- SHARE_INSTALL_PREFIX)
-endif()
+
+_define_absolute(DATAROOTDIR "share"
+ "read-only architecture-independent data root"
+ SHARE_INSTALL_PREFIX)
_define_relative(DATADIR DATAROOTDIR ""
"read-only architecture-independent data"
This diff is collapsed.
diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp
index 7711e9b..b6280ed 100644
index 6682d62..d975c57 100644
--- a/src/kcatalog.cpp
+++ b/src/kcatalog.cpp
@@ -112,7 +112,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
@@ -118,7 +118,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
{
QString relpath = QString::fromLatin1("%1/LC_MESSAGES/%2.mo")
QString relpath = QStringLiteral("%1/LC_MESSAGES/%2.mo")
.arg(language, QFile::decodeName(domain));
- QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+ QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation,
QString::fromLatin1("locale/") + relpath);
QStringLiteral("locale/") + relpath);
QString localeDir;
if (file.isEmpty()) {
@@ -127,7 +127,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
@@ -133,7 +133,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_)
{
QString domain = QFile::decodeName(domain_);
- QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
+ QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::AppDataLocation,
QString::fromLatin1("locale"),
QStringLiteral("locale"),
QStandardPaths::LocateDirectory);
QSet<QString> availableLanguages;
SET(PREFIX_ext_freetype "${EXTPREFIX}" )
ExternalProject_Add( ext_freetype
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/freetype-2.6.tar.gz
URL_MD5 1d733ea6c1b7b3df38169fbdbec47d2b
URL http://files.kde.org/krita/build/dependencies/freetype-2.6.5.tar.gz
URL_MD5 31b2276515d9ee1c7f37d9c9f4f3145a
INSTALL_DIR ${PREFIX_ext_freetype}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_freetype} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
......
SET(PREFIX_ext_gettext "${EXTPREFIX}" )
if (MSVC)
if (MSVC OR MINGW)
ExternalProject_Add(
ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
......@@ -14,14 +14,14 @@ ExternalProject_Add(
ALWAYS 0
DEPENDS ext_patch ext_iconv
)
else (MSVC)
else (MSVC OR MINGW)
ExternalProject_Add( ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/gettext-0.19.6.tar.gz
URL_MD5 6d1447f8c5c45c329371ef4bfe7d79a5
URL http://files.kde.org/krita/build/dependencies/gettext-0.19.8.tar.gz
URL_MD5 e4fffc004f21596becd1055cf36be31d
INSTALL_DIR ${PREFIX_ext_gettext}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_gettext} --disable-java ${GLOBAL_AUTOMAKE_PROFILE}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_gettext} --disable-java ${GLOBAL_AUTOMAKE_PROFILE} --disable-native-java
BUILD_COMMAND make
INSTALL_COMMAND make install
......@@ -29,4 +29,4 @@ ExternalProject_Add( ext_gettext
ALWAYS 0
DEPENDS ext_iconv
)
endif (MSVC)
endif (MSVC OR MINGW)
......@@ -2,7 +2,7 @@
# From https://github.com/ampl/gsl. which adds CMake support to gsl
#
SET(EXTPREFIX_gsl "${EXTPREFIX}" )
if (MSVC)
if (MSVC OR MINGW)
ExternalProject_Add(
ext_gsl
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
......
SET(PREFIX_ext_iconv "${EXTPREFIX}" )
if (MSVC)
if (MSVC OR MINGW)
ExternalProject_Add( ext_iconv
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/win-iconv-0.0.6.tar.bz2
......
......@@ -22,3 +22,16 @@ if (MSVC)
DEPENDEES install
)
endif()
if (MINGW)
ExternalProject_Add_Step(
ext_ilmbase
post_install
COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/libHalf.dll ${PREFIX_ext_ilmbase}/bin/libHalf.dll
COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/libIex.dll ${PREFIX_ext_ilmbase}/bin/libIex.dll
COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/libImath.dll ${PREFIX_ext_ilmbase}/bin/libImath.dll
COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/libIlmThread.dll ${PREFIX_ext_ilmbase}/bin/libIlmThread.dll
COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_ilmbase}/lib/libIexMath.dll ${PREFIX_ext_ilmbase}/bin/libIexMath.dll
DEPENDEES install
)
endif()
SET(PREFIX_ext_jpeg "${EXTPREFIX}" )
if (MSVC)
if (MSVC OR MINGW)
ExternalProject_Add( ext_jpeg
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.4.2.tar.gz
URL_MD5 86b0d5f7507c2e6c21c00219162c3c44
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.5.0.tar.gz
URL_MD5 3fc5d9b6a8bce96161659ae7a9939257
INSTALL_DIR ${PREFIX_ext_jpeg}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_jpeg} -DWITH_SIMD=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
......@@ -14,8 +14,8 @@ ExternalProject_Add( ext_jpeg
else()
ExternalProject_Add( ext_jpeg
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.4.2.tar.gz
URL_MD5 86b0d5f7507c2e6c21c00219162c3c44
URL http://files.kde.org/krita/build/dependencies/libjpeg-turbo-1.5.0.tar.gz