mirror of
				https://git.tardis.systems/mirrors/yuzu
				synced 2025-10-31 10:44:49 +01:00 
			
		
		
		
	Modularization of copy_msvc_libraries cmake funct
Created a new folder in Citra's root called CMakeModules that should contain cmake functions used by the various CMakeLists.txt.
This commit is contained in:
		
							parent
							
								
									942f70951d
								
							
						
					
					
						commit
						031fc3a460
					
				| @ -1,5 +1,6 @@ | ||||
| # CMake 3.2 required for cmake to know the right flags for CXX standard on OSX | ||||
| cmake_minimum_required(VERSION 3.2) | ||||
| set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) | ||||
| 
 | ||||
| function(download_bundled_external remote_path lib_name prefix_var) | ||||
|     set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}") | ||||
|  | ||||
							
								
								
									
										19
									
								
								CMakeModules/CopyMSVCLibsQt.cmake
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								CMakeModules/CopyMSVCLibsQt.cmake
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,19 @@ | ||||
| function(copy_msvc_libraries) | ||||
|     include(WindowsCopyFiles) | ||||
|     set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | ||||
|     windows_copy_files(citra-qt ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) | ||||
| 
 | ||||
|     set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") | ||||
|     set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") | ||||
|     set(PLATFORMS ${DLL_DEST}platforms/) | ||||
|     windows_copy_files(citra-qt ${Qt5_DLL_DIR} ${DLL_DEST} | ||||
|         icudt*.dll | ||||
|         icuin*.dll | ||||
|         icuuc*.dll | ||||
|         Qt5Core$<$<CONFIG:Debug>:d>.* | ||||
|         Qt5Gui$<$<CONFIG:Debug>:d>.* | ||||
|         Qt5OpenGL$<$<CONFIG:Debug>:d>.* | ||||
|         Qt5Widgets$<$<CONFIG:Debug>:d>.* | ||||
|     ) | ||||
|     windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) | ||||
| endfunction(copy_msvc_libraries) | ||||
| @ -1,5 +1,6 @@ | ||||
| set(CMAKE_AUTOMOC ON) | ||||
| set(CMAKE_INCLUDE_CURRENT_DIR ON) | ||||
| set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) | ||||
| 
 | ||||
| set(SRCS | ||||
|             config.cpp | ||||
| @ -107,26 +108,7 @@ if(UNIX AND NOT APPLE) | ||||
|     install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") | ||||
| endif() | ||||
| 
 | ||||
| function(copy_msvc_libraries) | ||||
|     include(WindowsCopyFiles) | ||||
|     set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | ||||
|     windows_copy_files(citra-qt ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) | ||||
| 
 | ||||
|     set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") | ||||
|     set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") | ||||
|     set(PLATFORMS ${DLL_DEST}platforms/) | ||||
|     windows_copy_files(citra-qt ${Qt5_DLL_DIR} ${DLL_DEST} | ||||
|         icudt*.dll | ||||
|         icuin*.dll | ||||
|         icuuc*.dll | ||||
|         Qt5Core$<$<CONFIG:Debug>:d>.* | ||||
|         Qt5Gui$<$<CONFIG:Debug>:d>.* | ||||
|         Qt5OpenGL$<$<CONFIG:Debug>:d>.* | ||||
|         Qt5Widgets$<$<CONFIG:Debug>:d>.* | ||||
|     ) | ||||
|     windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) | ||||
| endfunction(copy_msvc_libraries) | ||||
| 
 | ||||
| include(CopyMSVCLibsQt) | ||||
| if (MSVC) | ||||
|     copy_msvc_libraries() | ||||
| endif() | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user