From efaa33a337de3722698582708840e35e305c4c9f Mon Sep 17 00:00:00 2001 From: oltolm Date: Wed, 16 Jul 2025 22:11:55 +0200 Subject: [PATCH] cmake: fix usages of target_link_libraries --- src/CMakeLists.txt | 1 - src/Cafe/CMakeLists.txt | 31 ++++++++++--------------------- src/Cemu/CMakeLists.txt | 11 +---------- src/Common/CMakeLists.txt | 3 --- src/audio/CMakeLists.txt | 5 +---- src/config/CMakeLists.txt | 6 +----- src/gui/wxgui/CMakeLists.txt | 30 +++++++++++++----------------- src/imgui/CMakeLists.txt | 4 ---- src/input/CMakeLists.txt | 10 +--------- src/resource/CMakeLists.txt | 2 +- src/util/CMakeLists.txt | 6 +----- 11 files changed, 29 insertions(+), 80 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 04b6e56c7d..902bafcff0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -138,7 +138,6 @@ target_link_libraries(CemuBin PRIVATE CemuGui CemuInput CemuUtil - OpenGL::GL SDL2::SDL2 ) diff --git a/src/Cafe/CMakeLists.txt b/src/Cafe/CMakeLists.txt index 8da817bcfd..7033014bd0 100644 --- a/src/Cafe/CMakeLists.txt +++ b/src/Cafe/CMakeLists.txt @@ -559,28 +559,17 @@ else() endif() target_link_libraries(CemuCafe PRIVATE - CemuAudio CemuCommon - CemuComponents - CemuConfig - CemuGui - CemuInput - CemuResource - CemuUtil - imguiImpl - Boost::headers - Boost::nowide - CURL::libcurl - fmt::fmt - ${glslang_target} - ih264d - OpenSSL::Crypto - OpenSSL::SSL - PNG::PNG - pugixml::pugixml - ZArchive::zarchive - ZLIB::ZLIB - zstd::zstd + CemuGui + ZArchive::zarchive + imguiImpl + pugixml::pugixml + ZLIB::ZLIB + CURL::libcurl + ih264d + ${glslang_target} + PUBLIC + OpenSSL::SSL ) if (ENABLE_WAYLAND) diff --git a/src/Cemu/CMakeLists.txt b/src/Cemu/CMakeLists.txt index cdf71c6280..83ab0af60a 100644 --- a/src/Cemu/CMakeLists.txt +++ b/src/Cemu/CMakeLists.txt @@ -43,17 +43,8 @@ set_property(TARGET CemuComponents PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$ target_include_directories(CemuComponents PUBLIC "../") target_link_libraries(CemuComponents PRIVATE - CemuCafe CemuCommon - CemuConfig - CemuGui - CemuUtil - Boost::headers - CURL::libcurl - OpenSSL::Crypto - OpenSSL::SSL - pugixml::pugixml - ZLIB::ZLIB + CemuGui ) # PUBLIC because fmt/format.h is included in ExpressionParser/ExpressionParser.h diff --git a/src/Common/CMakeLists.txt b/src/Common/CMakeLists.txt index dec0bc42d7..971dfd8065 100644 --- a/src/Common/CMakeLists.txt +++ b/src/Common/CMakeLists.txt @@ -59,9 +59,6 @@ target_precompile_headers(CemuCommon PUBLIC precompiled.h) target_include_directories(CemuCommon PUBLIC "../") target_link_libraries(CemuCommon PRIVATE - CemuCafe - CemuConfig - CemuComponents Boost::nowide Boost::filesystem glm::glm diff --git a/src/audio/CMakeLists.txt b/src/audio/CMakeLists.txt index a1d1a1d947..8d01499e53 100644 --- a/src/audio/CMakeLists.txt +++ b/src/audio/CMakeLists.txt @@ -31,11 +31,8 @@ endif() target_include_directories(CemuAudio PUBLIC "../") target_link_libraries(CemuAudio PRIVATE - CemuCafe - CemuGui CemuCommon - CemuConfig - CemuUtil + CemuGui ) if(ENABLE_CUBEB) diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt index abcacc6006..183f124af4 100644 --- a/src/config/CMakeLists.txt +++ b/src/config/CMakeLists.txt @@ -16,11 +16,7 @@ set_property(TARGET CemuConfig PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$