Restore TARGET_FILE usage for external libraries
This commit is contained in:
		
							parent
							
								
									6d81711cf8
								
							
						
					
					
						commit
						54e750cca0
					
				
					 4 changed files with 9 additions and 0 deletions
				
			
		
							
								
								
									
										2
									
								
								external/ffmpeg/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								external/ffmpeg/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -40,7 +40,9 @@ else()
 | 
				
			||||||
        ${ffmpeg_lib_loc}/libswscale/libswscale.a
 | 
					        ${ffmpeg_lib_loc}/libswscale/libswscale.a
 | 
				
			||||||
        ${ffmpeg_lib_loc}/libavutil/libavutil.a
 | 
					        ${ffmpeg_lib_loc}/libavutil/libavutil.a
 | 
				
			||||||
        $<LINK_ONLY:desktop-app::external_opus>
 | 
					        $<LINK_ONLY:desktop-app::external_opus>
 | 
				
			||||||
 | 
					        $<TARGET_FILE:desktop-app::external_opus>
 | 
				
			||||||
        $<LINK_ONLY:desktop-app::external_vpx>
 | 
					        $<LINK_ONLY:desktop-app::external_vpx>
 | 
				
			||||||
 | 
					        $<TARGET_FILE:desktop-app::external_vpx>
 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
    if (APPLE)
 | 
					    if (APPLE)
 | 
				
			||||||
        target_link_libraries(external_ffmpeg INTERFACE bz2)
 | 
					        target_link_libraries(external_ffmpeg INTERFACE bz2)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										3
									
								
								external/qt/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								external/qt/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -260,8 +260,11 @@ target_link_libraries(external_qt
 | 
				
			||||||
INTERFACE
 | 
					INTERFACE
 | 
				
			||||||
    ${qt_libs_list}
 | 
					    ${qt_libs_list}
 | 
				
			||||||
    $<LINK_ONLY:desktop-app::external_openssl>
 | 
					    $<LINK_ONLY:desktop-app::external_openssl>
 | 
				
			||||||
 | 
					    $<TARGET_FILE:desktop-app::external_openssl_ssl>
 | 
				
			||||||
 | 
					    $<TARGET_FILE:desktop-app::external_openssl_crypto>
 | 
				
			||||||
    $<LINK_ONLY:desktop-app::external_jpeg>
 | 
					    $<LINK_ONLY:desktop-app::external_jpeg>
 | 
				
			||||||
    $<LINK_ONLY:desktop-app::external_zlib>
 | 
					    $<LINK_ONLY:desktop-app::external_zlib>
 | 
				
			||||||
 | 
					    $<TARGET_FILE:desktop-app::external_zlib>
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if (LINUX)
 | 
					if (LINUX)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								external/qt/qt6/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								external/qt/qt6/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -235,6 +235,8 @@ target_link_libraries(external_qt
 | 
				
			||||||
INTERFACE
 | 
					INTERFACE
 | 
				
			||||||
    ${qt_libs_list}
 | 
					    ${qt_libs_list}
 | 
				
			||||||
    $<LINK_ONLY:desktop-app::external_openssl>
 | 
					    $<LINK_ONLY:desktop-app::external_openssl>
 | 
				
			||||||
 | 
					    $<TARGET_FILE:desktop-app::external_openssl_ssl>
 | 
				
			||||||
 | 
					    $<TARGET_FILE:desktop-app::external_openssl_crypto>
 | 
				
			||||||
    $<LINK_ONLY:desktop-app::external_jpeg>
 | 
					    $<LINK_ONLY:desktop-app::external_jpeg>
 | 
				
			||||||
    $<LINK_ONLY:desktop-app::external_zlib>
 | 
					    $<LINK_ONLY:desktop-app::external_zlib>
 | 
				
			||||||
    $<TARGET_FILE:desktop-app::external_zlib>
 | 
					    $<TARGET_FILE:desktop-app::external_zlib>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								external/webrtc/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								external/webrtc/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -90,7 +90,9 @@ INTERFACE
 | 
				
			||||||
    $<LINK_ONLY:desktop-app::external_openssl>
 | 
					    $<LINK_ONLY:desktop-app::external_openssl>
 | 
				
			||||||
    $<LINK_ONLY:desktop-app::external_jpeg>
 | 
					    $<LINK_ONLY:desktop-app::external_jpeg>
 | 
				
			||||||
    $<LINK_ONLY:desktop-app::external_opus>
 | 
					    $<LINK_ONLY:desktop-app::external_opus>
 | 
				
			||||||
 | 
					    $<TARGET_FILE:desktop-app::external_opus>
 | 
				
			||||||
    $<LINK_ONLY:desktop-app::external_vpx>
 | 
					    $<LINK_ONLY:desktop-app::external_vpx>
 | 
				
			||||||
 | 
					    $<TARGET_FILE:desktop-app::external_vpx>
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if (WIN32)
 | 
					if (WIN32)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue