mirror of
				https://github.com/vcmi/vcmi.git
				synced 2025-10-31 00:07:39 +02:00 
			
		
		
		
	Do not search for client-specific packages if client is not being built
This commit is contained in:
		| @@ -451,12 +451,6 @@ if(TARGET zlib::zlib) | |||||||
| 	add_library(ZLIB::ZLIB ALIAS zlib::zlib) | 	add_library(ZLIB::ZLIB ALIAS zlib::zlib) | ||||||
| endif() | endif() | ||||||
|  |  | ||||||
| set(FFMPEG_COMPONENTS avutil swscale avformat avcodec) |  | ||||||
| if(APPLE_IOS AND NOT USING_CONAN) |  | ||||||
| 	list(APPEND FFMPEG_COMPONENTS swresample) |  | ||||||
| endif() |  | ||||||
| find_package(ffmpeg COMPONENTS ${FFMPEG_COMPONENTS}) |  | ||||||
|  |  | ||||||
| option(FORCE_BUNDLED_MINIZIP "Force bundled Minizip library" OFF) | option(FORCE_BUNDLED_MINIZIP "Force bundled Minizip library" OFF) | ||||||
| if(NOT FORCE_BUNDLED_MINIZIP) | if(NOT FORCE_BUNDLED_MINIZIP) | ||||||
| 	find_package(minizip) | 	find_package(minizip) | ||||||
| @@ -465,18 +459,26 @@ if(NOT FORCE_BUNDLED_MINIZIP) | |||||||
| 	endif() | 	endif() | ||||||
| endif() | endif() | ||||||
|  |  | ||||||
| find_package(SDL2 REQUIRED) | if (ENABLE_CLIENT) | ||||||
| find_package(SDL2_image REQUIRED) | 	set(FFMPEG_COMPONENTS avutil swscale avformat avcodec) | ||||||
| if(TARGET SDL2_image::SDL2_image) | 	if(APPLE_IOS AND NOT USING_CONAN) | ||||||
| 	add_library(SDL2::Image ALIAS SDL2_image::SDL2_image) | 		list(APPEND FFMPEG_COMPONENTS swresample) | ||||||
| endif() | 	endif() | ||||||
| find_package(SDL2_mixer REQUIRED) | 	find_package(ffmpeg COMPONENTS ${FFMPEG_COMPONENTS}) | ||||||
| if(TARGET SDL2_mixer::SDL2_mixer) |  | ||||||
| 	add_library(SDL2::Mixer ALIAS SDL2_mixer::SDL2_mixer) | 	find_package(SDL2 REQUIRED) | ||||||
| endif() | 	find_package(SDL2_image REQUIRED) | ||||||
| find_package(SDL2_ttf REQUIRED) | 	if(TARGET SDL2_image::SDL2_image) | ||||||
| if(TARGET SDL2_ttf::SDL2_ttf) | 		add_library(SDL2::Image ALIAS SDL2_image::SDL2_image) | ||||||
| 	add_library(SDL2::TTF ALIAS SDL2_ttf::SDL2_ttf) | 	endif() | ||||||
|  | 	find_package(SDL2_mixer REQUIRED) | ||||||
|  | 	if(TARGET SDL2_mixer::SDL2_mixer) | ||||||
|  | 		add_library(SDL2::Mixer ALIAS SDL2_mixer::SDL2_mixer) | ||||||
|  | 	endif() | ||||||
|  | 	find_package(SDL2_ttf REQUIRED) | ||||||
|  | 	if(TARGET SDL2_ttf::SDL2_ttf) | ||||||
|  | 		add_library(SDL2::TTF ALIAS SDL2_ttf::SDL2_ttf) | ||||||
|  | 	endif() | ||||||
| endif() | endif() | ||||||
|  |  | ||||||
| if(ENABLE_LOBBY) | if(ENABLE_LOBBY) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user