[CMake] Support WZ_MINGW_DIST_PATH

Warzone2100 · Nov 15, 2022 · 1094537 · 1094537
1 parent e886e41
commit 1094537
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -661,8 +661,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
 			list(APPEND _wz_fixup_bundle_ignored_filenames "dbghelp.dll")
 			list(APPEND _wz_fixup_bundle_nocopy_libraries "dbghelp.dll")
 			if(MINGW)
+				set(_additional_lookup_options)
+				if(DEFINED WZ_MINGW_DIST_PATH)
+					message(STATUS "WZ_MINGW_DIST_PATH: "${WZ_MINGW_DIST_PATH}"")
+					set(_additional_lookup_options HINTS "${WZ_MINGW_DIST_PATH}")
+				endif()
 				# Find path to C++ stdlib, and preserve for later fixup_bundle use
-				find_file(WZ_STDCXXDLL NAMES "libc++.dll" "libstdc++-6.dll")
+				find_file(WZ_STDCXXDLL NAMES "libc++.dll" "libstdc++-6.dll" ${_additional_lookup_options})
 				if(WZ_STDCXXDLL)
 					message(STATUS "Detected C++ stdlib DLL: ${WZ_STDCXXDLL}")
 					get_filename_component(WZ_STDCXXDLL_PATH "${WZ_STDCXXDLL}" DIRECTORY)