build: copy + install mingw dll's libgcc_s_seh-1.dll, libstdc++-6.dll…

…, libwinpthread-1.dll
ericwa · Sep 16, 2023 · 872f5fe · 872f5fe
1 parent d189145
commit 872f5fe
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,6 +61,41 @@ endif ()
 
 add_definitions(-DERICWTOOLS_VERSION="${GIT_DESCRIBE}")
 
+# MINGW stuff
+if(MINGW)
+	find_file(LIB_GCC_S_SEH_1_DLL NAMES "libgcc_s_seh-1.dll")
+	find_file(LIB_STDCPP_6_DLL NAMES "libstdc++-6.dll")
+	find_file(LIB_WINPTHREAD_1_DLL NAMES "libwinpthread-1.dll")
+
+	if(LIB_GCC_S_SEH_1_DLL)
+		install(FILES ${LIB_GCC_S_SEH_1_DLL} DESTINATION bin)
+	endif()
+	if(LIB_STDCPP_6_DLL)
+		install(FILES ${LIB_STDCPP_6_DLL} DESTINATION bin)
+	endif()
+	if(LIB_WINPTHREAD_1_DLL)
+		install(FILES ${LIB_WINPTHREAD_1_DLL} DESTINATION bin)
+	endif()
+endif()
+
+function(copy_mingw_dlls TARGETNAME)
+	if (LIB_GCC_S_SEH_1_DLL)
+		add_custom_command(TARGET ${TARGETNAME} POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${LIB_GCC_S_SEH_1_DLL}" "$<TARGET_FILE_DIR:${TARGETNAME}>"
+		)
+	endif()
+	if (LIB_STDCPP_6_DLL)
+		add_custom_command(TARGET ${TARGETNAME} POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${LIB_STDCPP_6_DLL}" "$<TARGET_FILE_DIR:${TARGETNAME}>"
+		)
+	endif()
+	if (LIB_WINPTHREAD_1_DLL)
+		add_custom_command(TARGET ${TARGETNAME} POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${LIB_WINPTHREAD_1_DLL}" "$<TARGET_FILE_DIR:${TARGETNAME}>"
+		)
+	endif()
+endfunction()
+
 if (WIN32)
 	set("NO_ITERATOR_DEBUG" FALSE CACHE BOOL "Whether to use MSVC iterator debugging or not")
 

diff --git a/bspinfo/CMakeLists.txt b/bspinfo/CMakeLists.txt
@@ -6,5 +6,6 @@ add_custom_command(TARGET bspinfo POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbb>" "$<TARGET_FILE_DIR:bspinfo>"
                    COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbbmalloc>" "$<TARGET_FILE_DIR:bspinfo>"
                    )
+copy_mingw_dlls(bspinfo)
 
 install(TARGETS bspinfo RUNTIME DESTINATION bin)
diff --git a/bsputil/CMakeLists.txt b/bsputil/CMakeLists.txt
@@ -14,5 +14,6 @@ add_custom_command(TARGET bsputil POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbb>" "$<TARGET_FILE_DIR:bsputil>"
 				   COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbbmalloc>" "$<TARGET_FILE_DIR:bsputil>"
 				   )
+copy_mingw_dlls(bsputil)
 
 install(TARGETS bsputil RUNTIME DESTINATION bin)
diff --git a/light/CMakeLists.txt b/light/CMakeLists.txt
@@ -145,5 +145,7 @@ if (embree_FOUND)
 	endif()
 endif(embree_FOUND)
 
+copy_mingw_dlls(light)
+
 install(TARGETS light RUNTIME DESTINATION bin)
 install(FILES ../gpl_v3.txt DESTINATION bin)
diff --git a/lightpreview/CMakeLists.txt b/lightpreview/CMakeLists.txt
@@ -60,6 +60,7 @@ if (NOT EMBREE_TBB_DLL STREQUAL EMBREE_TBB_DLL-NOTFOUND)
     add_custom_command(TARGET lightpreview POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy_if_different "${EMBREE_TBB_DLL}" "$<TARGET_FILE_DIR:lightpreview>")
 endif()
+copy_mingw_dlls(lightpreview)
 
 # Install Qt DLL's
 install(FILES $<TARGET_FILE:Qt5::Widgets> DESTINATION bin)

diff --git a/maputil/CMakeLists.txt b/maputil/CMakeLists.txt
@@ -27,5 +27,6 @@ add_custom_command(TARGET maputil POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbb>" "$<TARGET_FILE_DIR:maputil>"
 				   COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbbmalloc>" "$<TARGET_FILE_DIR:maputil>"
 				   )
+copy_mingw_dlls(maputil)
 
 install(TARGETS maputil RUNTIME DESTINATION bin)
diff --git a/qbsp/CMakeLists.txt b/qbsp/CMakeLists.txt
@@ -44,3 +44,5 @@ install(TARGETS qbsp RUNTIME DESTINATION bin)
 add_custom_command(TARGET qbsp POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbb>" "$<TARGET_FILE_DIR:qbsp>"
 				   COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbbmalloc>" "$<TARGET_FILE_DIR:qbsp>")
+
+copy_mingw_dlls(qbsp)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -43,5 +43,6 @@ if (NOT EMBREE_TBB_DLL STREQUAL EMBREE_TBB_DLL-NOTFOUND)
 	add_custom_command(TARGET tests POST_BUILD
 					   COMMAND ${CMAKE_COMMAND} -E copy_if_different "${EMBREE_TBB_DLL}" "$<TARGET_FILE_DIR:tests>")
 endif()
+copy_mingw_dlls(tests)
 
 add_definitions(-DHAVE_EMBREE)
diff --git a/vis/CMakeLists.txt b/vis/CMakeLists.txt
@@ -26,5 +26,6 @@ add_custom_command(TARGET vis POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbb>" "$<TARGET_FILE_DIR:vis>"
 				   COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbbmalloc>" "$<TARGET_FILE_DIR:vis>"
 				   )
+copy_mingw_dlls(vis)
 
 install(TARGETS vis RUNTIME DESTINATION bin)