From f35ca714548022ffe3ed1e93e794cb5ec6a3a742 Mon Sep 17 00:00:00 2001 From: oltolm Date: Sun, 1 Oct 2023 22:15:43 +0200 Subject: [PATCH] cmake: fix libcurl compilation --- 3rdparty/CMakeLists.txt | 2 +- 3rdparty/curl/CMakeLists.txt | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 1fc11fb4d9..4006a4920c 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -373,7 +373,7 @@ add_library(3rdparty::openal ALIAS 3rdparty_openal) add_library(3rdparty::ffmpeg ALIAS 3rdparty_ffmpeg) add_library(3rdparty::glew ALIAS 3rdparty_glew) 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::sdl2 ALIAS ${SDL2_TARGET}) add_library(3rdparty::miniupnpc ALIAS libminiupnpc-static) diff --git a/3rdparty/curl/CMakeLists.txt b/3rdparty/curl/CMakeLists.txt index 2246c0205d..7554225be0 100644 --- a/3rdparty/curl/CMakeLists.txt +++ b/3rdparty/curl/CMakeLists.txt @@ -3,8 +3,8 @@ if(USE_SYSTEM_CURL) message(STATUS "RPCS3: using shared libcurl") find_package(CURL REQUIRED) - add_library(libcurl INTERFACE) - target_link_libraries(libcurl INTERFACE CURL::libcurl) + add_library(3rdparty_libcurl INTERFACE) + target_link_libraries(3rdparty_libcurl INTERFACE CURL::libcurl) else() message(STATUS "RPCS3: building libcurl + wolfssl submodules") 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) - target_link_libraries(libcurl PRIVATE wolfssl) + target_link_libraries(libcurl_object PRIVATE wolfssl) if(MSVC) - target_compile_definitions(libcurl PRIVATE HAVE_SSIZE_T) + target_compile_definitions(libcurl_object PRIVATE HAVE_SSIZE_T) endif() + add_library(3rdparty_libcurl INTERFACE) + target_link_libraries(3rdparty_libcurl INTERFACE libcurl_static) endif()