Pass make command to dependencies. Android + ninja works.

agruzdev · agruzdev · commit 6c4031d0ebe1 · 2026-06-07T13:31:21.000+03:00
diff --git a/cmake/dependency.brotli.cmake b/cmake/dependency.brotli.cmake
@@ -19,7 +19,7 @@ ExternalProject_Add(BROTLI
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET}
     INSTALL_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t install
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG}
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS}
         "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_TESTING=OFF" "-DBROTLI_BUILD_FOR_PACKAGE=OFF" "-DBROTLI_BUILD_TOOLS=OFF"
         "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG} ${FPIC_FLAG}" "-DCMAKE_DEBUG_POSTFIX=" "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/brotli/install"
     EXCLUDE_FROM_ALL
diff --git a/cmake/dependency.de265.cmake b/cmake/dependency.de265.cmake
@@ -19,7 +19,7 @@ ExternalProject_Add(DE265
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t de265
     INSTALL_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t install
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DBUILD_SHARED_LIBS=OFF" "-DENABLE_DECODER=ON" "-DENABLE_ENCODER=OFF" "-DENABLE_SDL=OFF"
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DBUILD_SHARED_LIBS=OFF" "-DENABLE_DECODER=ON" "-DENABLE_ENCODER=OFF" "-DENABLE_SDL=OFF"
         "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS} ${ZERO_WARNINGS_FLAG}" "-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} ${ZERO_WARNINGS_FLAG}"
         "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/libde265/install" "-DCMAKE_DEBUG_POSTFIX="
     EXCLUDE_FROM_ALL
diff --git a/cmake/dependency.heif.cmake b/cmake/dependency.heif.cmake
@@ -24,7 +24,7 @@ ExternalProject_Add(HEIF
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t heif
     INSTALL_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t install
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG}
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS}
         "-DBUILD_SHARED_LIBS=ON" "-DBUILD_TESTING=OFF" "-DENABLE_EXPERIMENTAL_FEATURES=OFF" "-DCMAKE_COMPILE_WARNING_AS_ERROR=OFF"
         "-DENABLE_PLUGIN_LOADING=OFF" "-DWITH_REDUCED_VISIBILITY=ON" "-DWITH_EXAMPLES=OFF" "-DWITH_FUZZERS=OFF"
         "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/heif/install" "-DCMAKE_SHARED_LIBRARY_PREFIX=lib"
diff --git a/cmake/dependency.highway.cmake b/cmake/dependency.highway.cmake
@@ -18,7 +18,7 @@ ExternalProject_Add(HIGHWAY
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET}
     INSTALL_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t install
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_TESTING=OFF" "-DHWY_ENABLE_TESTS=OFF" "-DHWY_ENABLE_EXAMPLES=OFF"
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_TESTING=OFF" "-DHWY_ENABLE_TESTS=OFF" "-DHWY_ENABLE_EXAMPLES=OFF"
         "-DHWY_FORCE_STATIC_LIBS=ON" "-DHWY_ENABLE_CONTRIB=OFF" "-DHWY_TEST_STANDALONE=OFF" "-DHWY_WARNINGS_ARE_ERRORS=OFF" "-DHWY_CMAKE_HEADER_ONLY=OFF"
         "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG} ${FPIC_FLAG}" "-DCMAKE_DEBUG_POSTFIX=" "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/highway/install"
     EXCLUDE_FROM_ALL
diff --git a/cmake/dependency.imath.cmake b/cmake/dependency.imath.cmake
@@ -22,7 +22,7 @@ ExternalProject_Add(IMATH
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET}
     INSTALL_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t install
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_TESTING=OFF" "-DIMATH_LIB_SUFFIX="
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_TESTING=OFF" "-DIMATH_LIB_SUFFIX="
         "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG} ${FPIC_FLAG}" "-DCMAKE_DEBUG_POSTFIX=" "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/imath/install"
     EXCLUDE_FROM_ALL
 )
diff --git a/cmake/dependency.jpeg.cmake b/cmake/dependency.jpeg.cmake
@@ -22,7 +22,7 @@ if (JPEG_REPOSITORY STREQUAL "IJG")
                 -t "${EXTERNALPROJECT_SOURCE_PREFIX}/jpeg/source"
         BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET}
         INSTALL_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t install
-        CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/jpeg/install"
+        CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/jpeg/install"
         EXCLUDE_FROM_ALL
     )
 
@@ -57,7 +57,7 @@ elseif(JPEG_REPOSITORY STREQUAL "JPEG-turbo")
                                                  "${EXTERNALPROJECT_BINARY_ROOT}/turbojpeg/build/jversion.h"
                                                  "${EXTERNALPROJECT_BINARY_ROOT}/turbojpeg/build/jconfigint.h"
                     -t "${EXTERNALPROJECT_BINARY_ROOT}/turbojpeg/install/include"
-        CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DENABLE_SHARED=OFF" "-DENABLE_STATIC=ON" "-DWITH_JPEG7=ON" "-DWITH_CRT_DLL=ON"
+        CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DENABLE_SHARED=OFF" "-DENABLE_STATIC=ON" "-DWITH_JPEG7=ON" "-DWITH_CRT_DLL=ON"
             "-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON" "-DWITH_TOOLS=OFF" "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/turbojpeg/install"
         EXCLUDE_FROM_ALL
     )
diff --git a/cmake/dependency.jpegxl.cmake b/cmake/dependency.jpegxl.cmake
@@ -26,7 +26,7 @@ ExternalProject_Add(JPEGXL
     UPDATE_COMMAND ""
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t jxl
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG}
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS}
         "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_TESTING=OFF" "-DJPEGXL_ENABLE_BENCHMARK=OFF" "-DJPEGXL_ENABLE_EXAMPLES=OFF" "-DJPEGXL_ENABLE_JNI=OFF"
         "-DJPEGXL_ENABLE_JPEGLI=OFF" "-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF" "-DJPEGXL_ENABLE_MANPAGES=OFF" "-DJPEGXL_ENABLE_OPENEXR=OFF" "-DJPEGXL_ENABLE_SJPEG=OFF"
         "-DJPEGXL_ENABLE_TOOLS=OFF" "-DJPEGXL_ENABLE_TOOLS=ON" "-DJPEGXL_WARNINGS_AS_ERRORS=OFF" "-DJPEGXL_ENABLE_SKCMS=OFF"
diff --git a/cmake/dependency.kvazaar.cmake b/cmake/dependency.kvazaar.cmake
@@ -19,7 +19,7 @@ ExternalProject_Add(KVAZAAR
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t kvazaar
     INSTALL_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t install
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_TESTS=OFF" "-DUSE_CRYPTO=OFF"
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_TESTS=OFF" "-DUSE_CRYPTO=OFF"
         "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS} ${ZERO_WARNINGS_FLAG}" "-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} ${ZERO_WARNINGS_FLAG}"
         "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/kvazaar/install" "-DCMAKE_DEBUG_POSTFIX="
     EXCLUDE_FROM_ALL
diff --git a/cmake/dependency.lcms2.cmake b/cmake/dependency.lcms2.cmake
@@ -18,7 +18,7 @@ ExternalProject_Add(LCMS2
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET}
     INSTALL_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t install
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DLCMS2_BUILD_SHARED=OFF" "-DLCMS2_BUILD_STATIC=ON" "-DLCMS2_BUILD_TESTS=OFF" "-DLCMS2_BUILD_TIFICC=OFF"
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DLCMS2_BUILD_SHARED=OFF" "-DLCMS2_BUILD_STATIC=ON" "-DLCMS2_BUILD_TESTS=OFF" "-DLCMS2_BUILD_TIFICC=OFF"
         "-DLCMS2_BUILD_JPGICC=OFF" "-DLCMS2_BUILD_TOOLS=OFF" "-DLCMS2_WITH_JPEG=OFF" "-DLCMS2_WITH_TIFF=OFF" "-DLCMS2_WITH_ZLIB=OFF"
         "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG} ${FPIC_FLAG} -DCMS_NO_REGISTER_KEYWORD=1" "-DCMAKE_DEBUG_POSTFIX=" "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/lcms2/install"
     EXCLUDE_FROM_ALL
diff --git a/cmake/dependency.openexr.cmake b/cmake/dependency.openexr.cmake
@@ -24,7 +24,7 @@ ExternalProject_Add(EXR
     UPDATE_COMMAND ""
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t OpenEXR
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DOPENEXR_IS_SUBPROJECT=ON" "-DOPENEXR_FORCE_INTERNAL_IMATH=OFF" "-DOPENEXR_FORCE_INTERNAL_DEFLATE=ON" "-DOPENEXR_INSTALL=ON"
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DOPENEXR_IS_SUBPROJECT=ON" "-DOPENEXR_FORCE_INTERNAL_IMATH=OFF" "-DOPENEXR_FORCE_INTERNAL_DEFLATE=ON" "-DOPENEXR_INSTALL=ON"
         "-DOPENEXR_INSTALL_TOOLS=OFF" "-DOPENEXR_INSTALL_EXAMPLES=OFF" "-DOPENEXR_INSTALL_PKG_CONFIG=OFF" "-DOPENEXR_BUILD_TOOLS=OFF" "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_TESTING=OFF"
         "-DOPENEXR_LIB_SUFFIX=" "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG}" "-DCMAKE_CXX_FLAGS:STRING=${ZERO_WARNINGS_FLAG}" "-DCMAKE_DEBUG_POSTFIX="
         "-DImath_ROOT=${IMATH_ROOT}" "-Dopenjph_ROOT=${OPENJPH_ROOT}" "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/openexr/install"
diff --git a/cmake/dependency.openjpeg.cmake b/cmake/dependency.openjpeg.cmake
@@ -17,7 +17,7 @@ ExternalProject_Add(OPENJPEG
     UPDATE_COMMAND ""
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t openjp2
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DBUILD_STATIC_LIBS=ON" "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_CODEC=OFF" "-DBUILD_JPIP=OFF" "-DBUILD_TESTING=OFF"
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DBUILD_STATIC_LIBS=ON" "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_CODEC=OFF" "-DBUILD_JPIP=OFF" "-DBUILD_TESTING=OFF"
         "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG} ${FPIC_FLAG}"
         "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/openjpeg/install"
     EXCLUDE_FROM_ALL
diff --git a/cmake/dependency.openjph.cmake b/cmake/dependency.openjph.cmake
@@ -17,7 +17,7 @@ ExternalProject_Add(OPENJPH
     UPDATE_COMMAND ""
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t openjph
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DBUILD_SHARED_LIBS=OFF" "-DOJPH_BUILD_TESTS=OFF" "-DOJPH_ENABLE_TIFF_SUPPORT=OFF" "-DOJPH_BUILD_EXECUTABLES=OFF"
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DBUILD_SHARED_LIBS=OFF" "-DOJPH_BUILD_TESTS=OFF" "-DOJPH_ENABLE_TIFF_SUPPORT=OFF" "-DOJPH_BUILD_EXECUTABLES=OFF"
         "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG} ${FPIC_FLAG}" "-DCMAKE_DEBUG_POSTFIX=" "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/openjph/install"
     EXCLUDE_FROM_ALL
 )
diff --git a/cmake/dependency.png.cmake b/cmake/dependency.png.cmake
@@ -23,7 +23,7 @@ ExternalProject_Add(PNG
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET}
     INSTALL_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t install
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DZLIB_USE_STATIC_LIBS:BOOL=ON" "-DZLIB_ROOT:PATH=${ZLIB_ROOT}" 
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DZLIB_USE_STATIC_LIBS:BOOL=ON" "-DZLIB_ROOT:PATH=${ZLIB_ROOT}" 
         "-DPNG_SHARED=OFF" "-DPNG_STATIC=ON" "-DPNG_TESTS=OFF" "-DPNG_TOOLS=OFF" "-DPNG_FRAMEWORK=OFF"
         "-DPNG_DEBUG_POSTFIX=" "-DPNG_BUILD_ZLIB=OFF" "-DPNG_HARDWARE_OPTIMIZATIONS=ON" "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG} ${FPIC_FLAG}"
         "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/png/install" "-DSKIP_INSTALL_EXECUTABLES=ON" "-DSKIP_INSTALL_PROGRAMS=ON"
diff --git a/cmake/dependency.svtav1.cmake b/cmake/dependency.svtav1.cmake
@@ -22,7 +22,7 @@ ExternalProject_Add(SVTAV1
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET}
     INSTALL_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t install
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_APPS=OFF" "-DBUILD_TESTING=OFF" "-DSVT_AV1_LTO=ON" "-DUSE_CPUINFO=OFF"
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_APPS=OFF" "-DBUILD_TESTING=OFF" "-DSVT_AV1_LTO=ON" "-DUSE_CPUINFO=OFF"
         "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS} ${ZERO_WARNINGS_FLAG}" "-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} ${ZERO_WARNINGS_FLAG}"
         "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/svtav1/install" "-DCMAKE_DEBUG_POSTFIX="
     EXCLUDE_FROM_ALL
diff --git a/cmake/dependency.tiff.cmake b/cmake/dependency.tiff.cmake
@@ -25,7 +25,7 @@ ExternalProject_Add(TIFF
                                              "${EXTERNALPROJECT_SOURCE_PREFIX}/tiff/source/libtiff/tif_dir.h"
                                              "${EXTERNALPROJECT_BINARY_ROOT}/tiff/build/libtiff/tif_config.h"
                 -t "${EXTERNALPROJECT_BINARY_ROOT}/tiff/install/include"
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DZLIB_ROOT:PATH=${ZLIB_ROOT}" 
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DZLIB_ROOT:PATH=${ZLIB_ROOT}" 
         "-Dzlib=ON" "-Dlibdeflate=OFF" "-Djpeg=OFF" "-Dold-jpeg=OFF" "-Djpeg12=OFF" "-Djbig=OFF" "-Dwebp=OFF" "-Dzstd=OFF" "-Dlzma=OFF"
         "-Dtiff-tools=OFF" "-Dtiff-tests=OFF" "-Dtiff-docs=OFF" "-Dtiff-install=ON" "-Dwin32-io=OFF"
         "-DBUILD_SHARED_LIBS=OFF" "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG} ${FPIC_FLAG}" "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/tiff/install"
diff --git a/cmake/dependency.webp.cmake b/cmake/dependency.webp.cmake
@@ -19,7 +19,7 @@ ExternalProject_Add(WEBP
     UPDATE_COMMAND ""
     PATCH_COMMAND ""
     BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t webp libwebpmux sharpyuv
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DWEBP_BUILD_ANIM_UTILS=OFF" "-DWEBP_BUILD_CWEBP=OFF" "-DWEBP_BUILD_DWEBP=OFF" "-DWEBP_BUILD_GIF2WEBP=OFF" "-DWEBP_BUILD_IMG2WEBP=OFF" 
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DWEBP_BUILD_ANIM_UTILS=OFF" "-DWEBP_BUILD_CWEBP=OFF" "-DWEBP_BUILD_DWEBP=OFF" "-DWEBP_BUILD_GIF2WEBP=OFF" "-DWEBP_BUILD_IMG2WEBP=OFF" 
         "-DWEBP_BUILD_VWEBP=OFF" "-DWEBP_BUILD_WEBPINFO=OFF" "-DWEBP_BUILD_LIBWEBPMUX=ON" "-DWEBP_BUILD_WEBPMUX=OFF" "-DWEBP_BUILD_EXTRAS=OFF" "-DWEBP_UNICODE=ON"
         "-DBUILD_SHARED_LIBS=OFF" "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG}" "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/webp/install"
     EXCLUDE_FROM_ALL
diff --git a/cmake/dependency.zlib.cmake b/cmake/dependency.zlib.cmake
@@ -33,7 +33,7 @@ ExternalProject_Add(ZLIB
     UPDATE_COMMAND ""
     INSTALL_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t install
             COMMAND ${CMAKE_COMMAND} -E copy "${EXTERNALPROJECT_SOURCE_PREFIX}/zlib/source/zutil.h" -t "${ZLIB_ROOT}/include"
-    CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DCMAKE_INSTALL_PREFIX:PATH=${ZLIB_ROOT}"
+    CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DCMAKE_INSTALL_PREFIX:PATH=${ZLIB_ROOT}"
         "-DZLIB_BUILD_TESTING=OFF" "-DZLIB_BUILD_SHARED=OFF" "-DZLIB_BUILD_STATIC=ON"
         "-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG} ${FPIC_FLAG}"
 )
diff --git a/cmake/external_project_common.cmake b/cmake/external_project_common.cmake
@@ -74,6 +74,18 @@ else()
 endif()
 
 
+set(EXTERNALPROJECT_CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG})
+if (CMAKE_MAKE_PROGRAM)
+    set(EXTERNALPROJECT_CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}")
+endif()
+if (CMAKE_C_COMPILER)
+    set(EXTERNALPROJECT_CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}")
+endif()
+if (CMAKE_CXX_COMPILER)
+    set(EXTERNALPROJECT_CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
+endif()
+
+
 if (MSVC)
     set(ZERO_WARNINGS_FLAG "/w")
     set(EHSC_FLAG "/EHsc")

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ ExternalProject_Add(IMATH`
`22`	`22`	`PATCH_COMMAND ""`
`23`	`23`	`BUILD_COMMAND ${BUILD_COMMAND_FOR_TARGET}`
`24`	`24`	`INSTALL_COMMAND ${BUILD_COMMAND_FOR_TARGET} -t install`
`25`		`- CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_TESTING=OFF" "-DIMATH_LIB_SUFFIX="`
	`25`	`+ CMAKE_ARGS ${EXTERNALPROJECT_CMAKE_ARGS} "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_TESTING=OFF" "-DIMATH_LIB_SUFFIX="`
`26`	`26`	`"-DCMAKE_C_FLAGS:STRING=${ZERO_WARNINGS_FLAG} ${FPIC_FLAG}" "-DCMAKE_DEBUG_POSTFIX=" "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/imath/install"`
`27`	`27`	`EXCLUDE_FROM_ALL`
`28`	`28`	`)`