From 22e5c009c219355b36dbf41f6daf692328b674e6 Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 20 May 2026 18:56:06 +0000 Subject: [PATCH 1/2] fix again --- src/core/CMakeLists.txt | 4 +++- src/web_service/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 39aebd5f48..cf7b047286 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1167,6 +1167,8 @@ add_library(core STATIC tools/renderdoc.cpp tools/renderdoc.h) +# httplib must be linked before anything because openssl-external +target_link_libraries(core PRIVATE httplib::httplib) if (ENABLE_WIFI_SCAN) target_sources(core PRIVATE internal_network/wifi_scanner.cpp) if (PLATFORM_LINUX) @@ -1220,7 +1222,7 @@ target_link_libraries(core PRIVATE RenderDoc::API ZLIB::ZLIB) -target_link_libraries(core PUBLIC httplib::httplib zstd::zstd) +target_link_libraries(core PUBLIC zstd::zstd) if (ENABLE_WEB_SERVICE) target_compile_definitions(core PUBLIC ENABLE_WEB_SERVICE) diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt index 4e11139f6d..ec58d00da3 100644 --- a/src/web_service/CMakeLists.txt +++ b/src/web_service/CMakeLists.txt @@ -18,5 +18,5 @@ add_library(web_service STATIC create_target_directory_groups(web_service) target_include_directories(web_service PUBLIC ${cpp-jwt_SOURCE_DIR}/include) -target_link_libraries(web_service PRIVATE common network nlohmann_json::nlohmann_json httplib::httplib cpp-jwt::cpp-jwt) +target_link_libraries(web_service PRIVATE httplib::httplib common network nlohmann_json::nlohmann_json cpp-jwt::cpp-jwt) target_link_libraries(web_service PRIVATE OpenSSL::SSL OpenSSL::Crypto) From 46710a37bb37fafaae89f563daa19053dbc844b6 Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 20 May 2026 19:06:55 +0000 Subject: [PATCH 2/2] fx? --- src/common/CMakeLists.txt | 2 +- src/core/CMakeLists.txt | 6 +++--- src/qt_common/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 261709e5de..bffb6e3819 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -151,7 +151,7 @@ add_library( net/net.h net/net.cpp) # httplib must be put first otherwise external-openssl builds won't work -target_link_libraries(common PRIVATE httplib::httplib) +target_link_libraries(common PUBLIC httplib::httplib) if(WIN32) target_sources(common PRIVATE windows/timer_resolution.cpp windows/timer_resolution.h) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index cf7b047286..04c0aa8595 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1167,8 +1167,6 @@ add_library(core STATIC tools/renderdoc.cpp tools/renderdoc.h) -# httplib must be linked before anything because openssl-external -target_link_libraries(core PRIVATE httplib::httplib) if (ENABLE_WIFI_SCAN) target_sources(core PRIVATE internal_network/wifi_scanner.cpp) if (PLATFORM_LINUX) @@ -1208,7 +1206,9 @@ else() endif() target_include_directories(core PRIVATE ${OPUS_INCLUDE_DIRS}) -target_link_libraries(core PUBLIC common PRIVATE audio_core hid_core network video_core nx_tzdb tz) +target_link_libraries(core + PUBLIC common + PRIVATE audio_core hid_core network video_core nx_tzdb tz) if (BOOST_NO_HEADERS) target_link_libraries(core PUBLIC Boost::container Boost::heap Boost::asio Boost::process Boost::crc) diff --git a/src/qt_common/CMakeLists.txt b/src/qt_common/CMakeLists.txt index a8c4e51240..c8778df331 100644 --- a/src/qt_common/CMakeLists.txt +++ b/src/qt_common/CMakeLists.txt @@ -49,7 +49,7 @@ if (USE_DISCORD_PRESENCE) discord/discord_impl.cpp discord/discord_impl.h ) - target_link_libraries(qt_common PUBLIC DiscordRPC::discord-rpc httplib::httplib) + target_link_libraries(qt_common PUBLIC httplib::httplib DiscordRPC::discord-rpc) if (YUZU_USE_BUNDLED_OPENSSL) target_link_libraries(qt_common PUBLIC OpenSSL::SSL OpenSSL::Crypto)