Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: fix libcurl compilation

Browse Source
This commit is contained in:
oltolm
2023-10-01 22:15:43 +02:00
committed by Elad Ashkenazi
parent d1bea790f3
commit f35ca71454
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
3rdparty/CMakeLists.txt
Vendored
+1 -1
View File
@@ -373,7 +373,7 @@ add_library(3rdparty::openal ALIAS 3rdparty_openal)
add_library(3rdparty::ffmpeg ALIAS 3rdparty_ffmpeg) add_library(3rdparty::ffmpeg ALIAS 3rdparty_ffmpeg)
add_library(3rdparty::glew ALIAS 3rdparty_glew) add_library(3rdparty::glew ALIAS 3rdparty_glew)
add_library(3rdparty::wolfssl ALIAS wolfssl) add_library(3rdparty::wolfssl ALIAS wolfssl)
add_library(3rdparty::libcurl ALIAS libcurl) add_library(3rdparty::libcurl ALIAS 3rdparty_libcurl)
add_library(3rdparty::soundtouch ALIAS soundtouch) add_library(3rdparty::soundtouch ALIAS soundtouch)
add_library(3rdparty::sdl2 ALIAS ${SDL2_TARGET}) add_library(3rdparty::sdl2 ALIAS ${SDL2_TARGET})
add_library(3rdparty::miniupnpc ALIAS libminiupnpc-static) add_library(3rdparty::miniupnpc ALIAS libminiupnpc-static)
3rdparty/curl/CMakeLists.txt
Vendored
+6 -4
View File
@@ -3,8 +3,8 @@
if(USE_SYSTEM_CURL) if(USE_SYSTEM_CURL)
message(STATUS "RPCS3: using shared libcurl") message(STATUS "RPCS3: using shared libcurl")
find_package(CURL REQUIRED) find_package(CURL REQUIRED)
add_library(libcurl INTERFACE) add_library(3rdparty_libcurl INTERFACE)
target_link_libraries(libcurl INTERFACE CURL::libcurl) target_link_libraries(3rdparty_libcurl INTERFACE CURL::libcurl)
else() else()
message(STATUS "RPCS3: building libcurl + wolfssl submodules") message(STATUS "RPCS3: building libcurl + wolfssl submodules")
set(BUILD_CURL_EXE OFF CACHE BOOL "Set to ON to build curl executable.") set(BUILD_CURL_EXE OFF CACHE BOOL "Set to ON to build curl executable.")
@@ -28,9 +28,11 @@ else()
add_subdirectory(curl EXCLUDE_FROM_ALL) add_subdirectory(curl EXCLUDE_FROM_ALL)
target_link_libraries(libcurl PRIVATE wolfssl) target_link_libraries(libcurl_object PRIVATE wolfssl)
if(MSVC) if(MSVC)
target_compile_definitions(libcurl PRIVATE HAVE_SSIZE_T) target_compile_definitions(libcurl_object PRIVATE HAVE_SSIZE_T)
endif() endif()
add_library(3rdparty_libcurl INTERFACE)
target_link_libraries(3rdparty_libcurl INTERFACE libcurl_static)
endif() endif()