Commit 12dea12d authored by Boudewijn Rempt's avatar Boudewijn Rempt

Try to use both a pre-built static and a compiled gettext for the library

parent 332e11a6
......@@ -104,7 +104,8 @@ On Windows:
cmake --build . --config RelWithDebInfo --target ext_patch
cmake --build . --config RelWithDebInfo --target ext_png2ico
cmake --build . --config RelWithDebInfo --target ext_gettext_lib
On OSX and Windows:
cmake --build . --config RelWithDebInfo --target ext_gettext
......
......@@ -4,7 +4,7 @@ if (MINGW)
ExternalProject_Add(ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/gettext0.19.8.1-iconv1.14-shared-64.zip
URL http://files.kde.org/krita/build/dependencies/gettext0.19.8.1-iconv1.14-static-64.zip
URL_MD5 4c6b70667a83e6828749b93c283a4832
BUILD_COMMAND ${CMAKE_COMMAND} -E echo Deploying gettext 64-bit dependencies
......@@ -17,7 +17,7 @@ if (MINGW)
ExternalProject_Add(ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/gettext0.19.8.1-iconv1.14-shared-32.zip
URL http://files.kde.org/krita/build/dependencies/gettext0.19.8.1-iconv1.14-static-32.zip
URL_MD5 42f0db42b37a89ef2ebb64186fe1ee32
BUILD_COMMAND ${CMAKE_COMMAND} -E echo Deploying gettext 64-bit dependencies
......@@ -27,6 +27,17 @@ if (MINGW)
UPDATE_COMMAND ""
)
endif()
ExternalProject_Add (
ext_gettext_lib
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/gettext-0.18.tar.gz
URL_MD5 d52a3e061032a1ed13856d42fc86f0fd
PATCH_COMMAND ${PATCH_COMMAND} --binary -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gettext-0.18-20130319.diff
INSTALL_DIR ${PREFIX_ext_gettext}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gettext} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
DEPENDS ext_patch ext_iconv
)
else (MINGW)
ExternalProject_Add( ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
......
......@@ -706,9 +706,9 @@ if errorlevel 1 (
)
echo.
set EXT_TARGETS=patch png2ico zlib lzma qt boost eigen3 exiv2 fftw3 ilmbase
set EXT_TARGETS=patch png2ico zlib lzma ext_gettext_lib qt boost eigen3 exiv2 fftw3 ilmbase
set EXT_TARGETS=%EXT_TARGETS% jpeg lcms2 ocio openexr png tiff gsl vc libraw
set EXT_TARGETS=%EXT_TARGETS% giflib freetype poppler kwindowsystem drmingw gmic
set EXT_TARGETS=%EXT_TARGETS% giflib freetype poppler ext_gettext kwindowsystem drmingw gmic
set EXT_TARGETS=%EXT_TARGETS% python sip pyqt
set EXT_TARGETS=%EXT_TARGETS% quazip
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment