[cmake] BUILD_DEP_TARGET append Toolchain when CMAKE_ARGS passed

If a toolchain file is provided, pass it along to any internal dep cmake based
build systems.

7 files changed, 4 insertions, 7 deletions

diff --git a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake
index ba3e63f2fd..3a21bc26ca 100644
--- a/cmake/modules/FindCrossGUID.cmake
+++ b/cmake/modules/FindCrossGUID.cmake
@@ -10,7 +10,6 @@ if(ENABLE_INTERNAL_CROSSGUID)
   endif()
 
   set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
-                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                  -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
                  "${EXTRA_ARGS}")
   set(PATCH_COMMAND ${CMAKE_COMMAND} -E copy
diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
index 0e6c407836..4e18d74298 100644
--- a/cmake/modules/FindFFMPEG.cmake
+++ b/cmake/modules/FindFFMPEG.cmake
@@ -59,7 +59,6 @@ macro(buildFFMPEG)
     set(CROSS_ARGS -DDEPENDS_PATH=${DEPENDS_PATH}
                    -DPKG_CONFIG_EXECUTABLE=${PKG_CONFIG_EXECUTABLE}
                    -DCROSSCOMPILING=${CMAKE_CROSSCOMPILING}
-                   -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                    -DOS=${OS}
                    -DCMAKE_AR=${CMAKE_AR})
   endif()
diff --git a/cmake/modules/FindFmt.cmake b/cmake/modules/FindFmt.cmake
index fd85de23f7..aaf855ecbe 100644
--- a/cmake/modules/FindFmt.cmake
+++ b/cmake/modules/FindFmt.cmake
@@ -28,7 +28,6 @@ if(ENABLE_INTERNAL_FMT)
   set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
                  -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
                  -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                  -DCMAKE_INSTALL_LIBDIR=lib
                  -DFMT_DOC=OFF
                  -DFMT_TEST=OFF
diff --git a/cmake/modules/FindGtest.cmake b/cmake/modules/FindGtest.cmake
index e309875667..80d713dd50 100644
--- a/cmake/modules/FindGtest.cmake
+++ b/cmake/modules/FindGtest.cmake
@@ -22,8 +22,7 @@ if(ENABLE_INTERNAL_GTEST)
 
   set(GTEST_VERSION ${${MODULE}_VER})
 
-  set(CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-                 -DBUILD_GMOCK=OFF
+  set(CMAKE_ARGS -DBUILD_GMOCK=OFF
                  -DINSTALL_GTEST=ON
                  -DBUILD_SHARED_LIBS=OFF
                  -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
diff --git a/cmake/modules/FindRapidJSON.cmake b/cmake/modules/FindRapidJSON.cmake
index 5ba7afa742..e3943f5b32 100644
--- a/cmake/modules/FindRapidJSON.cmake
+++ b/cmake/modules/FindRapidJSON.cmake
@@ -23,7 +23,6 @@ if(ENABLE_INTERNAL_RapidJSON)
   set(RapidJSON_VERSION ${${MODULE}_VER})
 
   set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
-                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                  -DRAPIDJSON_BUILD_DOC=OFF
                  -DRAPIDJSON_BUILD_EXAMPLES=OFF
                  -DRAPIDJSON_BUILD_TESTS=OFF
diff --git a/cmake/modules/FindSpdlog.cmake b/cmake/modules/FindSpdlog.cmake
index 833bad1289..a78949cbdd 100644
--- a/cmake/modules/FindSpdlog.cmake
+++ b/cmake/modules/FindSpdlog.cmake
@@ -29,7 +29,6 @@ if(ENABLE_INTERNAL_SPDLOG)
   set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
                  -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
                  -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                  -DCMAKE_INSTALL_LIBDIR=lib
                  -DSPDLOG_BUILD_EXAMPLE=OFF
                  -DSPDLOG_BUILD_TESTS=OFF
diff --git a/cmake/scripts/common/ModuleHelpers.cmake b/cmake/scripts/common/ModuleHelpers.cmake
index 371e3d6a26..8a62f73ebd 100644
--- a/cmake/scripts/common/ModuleHelpers.cmake
+++ b/cmake/scripts/common/ModuleHelpers.cmake
@@ -102,6 +102,9 @@ macro(BUILD_DEP_TARGET)
 
   if(CMAKE_ARGS)
     set(CMAKE_ARGS CMAKE_ARGS ${CMAKE_ARGS})
+    if(CMAKE_TOOLCHAIN_FILE)
+      list(APPEND CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+    endif()
   endif()
 
   if(PATCH_COMMAND)