Commit 9e1ada22 authored by Alvin Wong's avatar Alvin Wong

Windows: Simplify use of ext_gettext target

parent 664d9dcd
......@@ -101,11 +101,10 @@ On Windows:
cmake --build . --config RelWithDebInfo --target ext_patch
cmake --build . --config RelWithDebInfo --target ext_png2ico
cmake --build . --config RelWithDebInfo --target ext_gettext
On OSX and Windows:
cmake --build . --config RelWithDebInfo --target ext_gettext_lib
cmake --build . --config RelWithDebInfo --target ext_gettext
On all operating systems:
......
SET(PREFIX_ext_gettext "${EXTPREFIX}" )
if (MINGW)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
ExternalProject_Add(ext_gettext
ExternalProject_Add(ext_gettext_bin
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/gettext0.19.8.1-iconv1.15-static-64.zip
......@@ -14,7 +14,7 @@ if (MINGW)
UPDATE_COMMAND ""
)
else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
ExternalProject_Add(ext_gettext
ExternalProject_Add(ext_gettext_bin
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/gettext0.19.8.1-iconv1.15-static-32.zip
......@@ -37,7 +37,9 @@ if (MINGW)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gettext} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
DEPENDS ext_patch ext_iconv
)
)
add_custom_target(ext_gettext)
add_dependencies(ext_gettext ext_gettext_bin ext_gettext_lib)
else (MINGW)
ExternalProject_Add( ext_gettext
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
......
......@@ -707,9 +707,9 @@ if errorlevel 1 (
)
echo.
set EXT_TARGETS=patch png2ico zlib lzma gettext_lib qt boost eigen3 exiv2 fftw3 ilmbase
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=%EXT_TARGETS% giflib freetype poppler gettext kwindowsystem drmingw gmic
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
......
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