diff --git a/cmake.deps/CMakeLists.txt b/cmake.deps/CMakeLists.txt index 4189eb4442..e5ab061952 100644 --- a/cmake.deps/CMakeLists.txt +++ b/cmake.deps/CMakeLists.txt @@ -62,6 +62,11 @@ option(USE_EXISTING_SRC_DIR "Skip download of deps sources in case of existing s set_default_buildtype(Release) get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + +if (NOT DEFINED DEPS_CMAKE_ARGS) + set(DEPS_CMAKE_ARGS) +endif() + if(NOT isMultiConfig) list(APPEND DEPS_CMAKE_ARGS -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) endif() @@ -73,6 +78,13 @@ if(HAS_OG_FLAG) set(DEFAULT_MAKE_CFLAGS CFLAGS+=-Og ${DEFAULT_MAKE_CFLAGS}) endif() +# Always pass the toolchain if it exists +if(CMAKE_TOOLCHAIN_FILE) + list(APPEND DEPS_CMAKE_ARGS + -D CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} + ) +endif() + set(DEPS_INCLUDE_FLAGS "-I\"${DEPS_INSTALL_DIR}/include\" -I\"${DEPS_INSTALL_DIR}/include/luajit-2.1\"") # If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET),