diff --git a/3rdparty/ext_gmic/CMakeLists.txt b/3rdparty/ext_gmic/CMakeLists.txt index 6117b07efe..7be84ac03a 100644 --- a/3rdparty/ext_gmic/CMakeLists.txt +++ b/3rdparty/ext_gmic/CMakeLists.txt @@ -1,45 +1,38 @@ SET(PREFIX_ext_gmic "${EXTPREFIX}" ) # Download the gmic sources -if (WIN32) - # gmic uses a shell script with wget to download some files which won't work - # on Windows, so we use CMake to download them instead - set(_GMIC_BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/gmic-downloads.cmake) -else (WIN32) - set(_GMIC_BUILD_COMMAND make -C src CImg.h gmic_stdlib.h) -endif (WIN32) ExternalProject_Add( ext_gmic_base DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - GIT_REPOSITORY https://github.com/dtschump/gmic.git - GIT_TAG master - GIT_SHALLOW 1 + URL http://gmic.eu/files/source/gmic_2.1.3.tar.gz + URL_HASH SHA1=f0832766f009a74287bb9fdbe013f4a84db1ad76 SOURCE_DIR gmic CONFIGURE_COMMAND "" - BUILD_COMMAND ${_GMIC_BUILD_COMMAND} + BUILD_COMMAND "" INSTALL_COMMAND "" BUILD_IN_SOURCE 1 ) # Download and build gmic-qt # FIXME: Forcing CMAKE_BUILD_TYPE to Release ExternalProject_Add( ext_gmic_qt DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL https://github.com/c-koi/gmic-qt/archive/v.211.tar.gz - URL_HASH SHA1=776db5f77a4044711a9c4a4b0c6533556f4b810d + URL https://github.com/c-koi/gmic-qt/archive/v.213.tar.gz + DOWNLOAD_NAME gmic-qt_2.1.3.tar.gz + URL_HASH SHA1=8c6489da2ce44ae3eae6ab7e9cf7b45716c0aacd SOURCE_DIR gmic-qt INSTALL_DIR ${PREFIX_ext_gmic} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gmic} -DGMIC_QT_HOST=krita -DCMAKE_BUILD_TYPE=Release ${GLOBAL_PROFILE} UPDATE_COMMAND "" INSTALL_COMMAND ${CMAKE_COMMAND} -E copy /gmic_krita_qt${CMAKE_EXECUTABLE_SUFFIX} /bin/gmic_krita_qt${CMAKE_EXECUTABLE_SUFFIX} DEPENDS ext_gmic_base ) add_custom_target(ext_gmic) add_dependencies(ext_gmic ext_gmic_qt) diff --git a/3rdparty/ext_gmic/gmic-downloads.cmake b/3rdparty/ext_gmic/gmic-downloads.cmake deleted file mode 100644 index 7bd4116961..0000000000 --- a/3rdparty/ext_gmic/gmic-downloads.cmake +++ /dev/null @@ -1,7 +0,0 @@ -message(STATUS "> Retrieve G'MIC Standard Library...") -file(DOWNLOAD http://gmic.eu/gmic_stdlib.h ${CMAKE_CURRENT_BINARY_DIR}/src/gmic_stdlib.h) -message(STATUS " done!") - -message(STATUS "> Retrieve CImg Library...") -file(DOWNLOAD https://github.com/dtschump/CImg/raw/master/CImg.h ${CMAKE_CURRENT_BINARY_DIR}/src/CImg.h) -message(STATUS " done!")