diff --git a/3rdparty/ext_fftw3/CMakeLists.txt b/3rdparty/ext_fftw3/CMakeLists.txt
index 9b01e68c61..848e1f87a8 100644
--- a/3rdparty/ext_fftw3/CMakeLists.txt
+++ b/3rdparty/ext_fftw3/CMakeLists.txt
@@ -1,29 +1,29 @@
 if (WIN32)
 SET(PREFIX_ext_fftw3 "${EXTPREFIX}" )
 ExternalProject_Add( ext_fftw3
         DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
      	URL http://www.fftw.org/fftw-3.3.8.tar.gz
         URL_MD5 8aac833c943d8e90d51b697b27d4384d
 
         PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch_mingw.patch
 
         INSTALL_DIR ${PREFIX_ext_fftw3}
         CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_fftw3} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DWITH_COMBINED_THREADS=ON -ENABLE_SSE=ON -ENABLE_SSE2=ON -DBUILD_TESTS=OFF
 
         UPDATE_COMMAND ""
 )
 else()
 SET(PREFIX_ext_fftw3 "${EXTPREFIX}" )
 ExternalProject_Add( ext_fftw3
         DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
      	URL http://www.fftw.org/fftw-3.3.8.tar.gz
         URL_MD5 8aac833c943d8e90d51b697b27d4384d
 
         PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch_mingw.patch
 
         INSTALL_DIR ${PREFIX_ext_fftw3}
-        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_fftw3} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DENABLE_THREADING=ON -DWITH_COMBINED_THREADS=ON -ENABLE_SSE=ON -ENABLE_SSE2=ON -DBUILD_TESTS=OFF
+        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_fftw3} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -ENABLE_SSE=ON -ENABLE_SSE2=ON -DBUILD_TESTS=OFF
 
         UPDATE_COMMAND ""
 )
 endif()
diff --git a/3rdparty/ext_gmic/CMakeLists.txt b/3rdparty/ext_gmic/CMakeLists.txt
index 85ff0eb197..c97d6e9080 100644
--- a/3rdparty/ext_gmic/CMakeLists.txt
+++ b/3rdparty/ext_gmic/CMakeLists.txt
@@ -1,37 +1,41 @@
 SET(PREFIX_ext_gmic "${EXTPREFIX}" )
 
 # Download the gmic sources
 ExternalProject_Add( ext_gmic_base
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
     URL https://gmic.eu/files/source/gmic_2.5.6.tar.gz
     URL_MD5 8deabebc29081657986ae6531e3fc1d7
 
+    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/cmake.diff
+          COMMAND  ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/no_threads.diff
+
     SOURCE_DIR gmic
 
-    CONFIGURE_COMMAND ""
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gmic} -D -DCMAKE_BUILD_TYPE=Release ${GLOBAL_PROFILE}
+
     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.2.5.6.tar.gz
     URL_MD5 4e7cf71d6348d44f98d3c132433c358c
     PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktop_icon.diff
 
     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 ""
 
     DEPENDS ext_gmic_base
 )
 
 add_custom_target(ext_gmic)
 add_dependencies(ext_gmic ext_gmic_qt)
diff --git a/3rdparty/ext_gmic/cmake.diff b/3rdparty/ext_gmic/cmake.diff
new file mode 100644
index 0000000000..7f9a989c24
--- /dev/null
+++ b/3rdparty/ext_gmic/cmake.diff
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3df1f8a..0bee815 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,7 +53,7 @@
+ #  knowledge of the CeCILL and CeCILL-C licenses and that you accept its terms.
+ #
+ 
+-cmake_minimum_required(VERSION 3.9)
++cmake_minimum_required(VERSION 3.5)
+ cmake_policy(SET CMP0046 OLD)
+ 
+ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
diff --git a/3rdparty/ext_gmic/no_threads.diff b/3rdparty/ext_gmic/no_threads.diff
new file mode 100644
index 0000000000..066e23d138
--- /dev/null
+++ b/3rdparty/ext_gmic/no_threads.diff
@@ -0,0 +1,13 @@
+diff --git a/src/CImg.h b/src/CImg.h
+index 9c116d2..afd8694 100644
+--- a/src/CImg.h
++++ b/src/CImg.h
+@@ -3137,7 +3137,7 @@ namespace cimg_library_suffixed {
+ #if defined(cimg_use_fftw3)
+     static struct FFTW3_info {
+       FFTW3_info() {
+-        fftw_init_threads();
++//        fftw_init_threads();
+       }
+     } _FFTW3_info;
+ #endif