cmake: fix usages of target_link_libraries

src/CMakeLists.txt

@@ -138,7 +138,6 @@ target_link_libraries(CemuBin PRIVATE
 	CemuGui
 	CemuInput
 	CemuUtil
-	OpenGL::GL
 	SDL2::SDL2
 )
 

src/Cafe/CMakeLists.txt

@@ -559,28 +559,17 @@ else()
 endif()
 
 target_link_libraries(CemuCafe PRIVATE
-	CemuAudio
 	CemuCommon
-	CemuComponents
+  CemuGui
-	CemuConfig
+  ZArchive::zarchive
-	CemuGui
+  imguiImpl
-	CemuInput
+  pugixml::pugixml
-	CemuResource
+  ZLIB::ZLIB
-	CemuUtil
+  CURL::libcurl
-	imguiImpl
+  ih264d
-	Boost::headers
+  ${glslang_target}
-	Boost::nowide
+  PUBLIC
-	CURL::libcurl
+  OpenSSL::SSL
-	fmt::fmt
-	${glslang_target}
-	ih264d
-	OpenSSL::Crypto
-	OpenSSL::SSL
-	PNG::PNG
-	pugixml::pugixml
-	ZArchive::zarchive
-	ZLIB::ZLIB
-	zstd::zstd
 )
 
 if (ENABLE_WAYLAND)

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
-	CemuGui
-	CemuUtil
-	Boost::headers
-	CURL::libcurl
-	OpenSSL::Crypto
-	OpenSSL::SSL
-	pugixml::pugixml
-	ZLIB::ZLIB
 )
 
 # PUBLIC because fmt/format.h is included in ExpressionParser/ExpressionParser.h

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

src/audio/CMakeLists.txt

@@ -31,11 +31,8 @@ endif()
 target_include_directories(CemuAudio PUBLIC "../")
 
 target_link_libraries(CemuAudio PRIVATE
-	CemuCafe
-	CemuGui
 	CemuCommon
-	CemuConfig
+	CemuGui
-	CemuUtil
 )
 
 if(ENABLE_CUBEB)

src/config/CMakeLists.txt

@@ -16,11 +16,7 @@ set_property(TARGET CemuConfig PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<C
 target_include_directories(CemuConfig PUBLIC "../")
 
 target_link_libraries(CemuConfig PRIVATE
-	CemuCafe
 	CemuCommon
     CemuGui
-	CemuUtil
+    Boost::program_options
-	Boost::headers
-	Boost::program_options
-	pugixml::pugixml
 )

src/gui/wxgui/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(CemuWxGui 
+add_library(CemuWxGui STATIC
   canvas/IRenderCanvas.h
   canvas/OpenGLCanvas.cpp
   canvas/OpenGLCanvas.h
@@ -126,20 +126,16 @@ target_include_directories(CemuWxGui PUBLIC "../")
 target_include_directories(CemuWxGui PUBLIC ${RAPIDJSON_INCLUDE_DIRS})
 
 target_link_libraries(CemuWxGui PRIVATE
-	CemuAudio
+  CemuCommon
-	CemuCafe
+  CemuResource
-	CemuCommon
+  libzip::zip
-	CemuComponents
+  ZArchive::zarchive
-	CemuConfig
+  CemuComponents
-	CemuInput
+  SDL2::SDL2
-	CemuResource
+  pugixml::pugixml
-	CemuUtil
+  CemuCafe
-	Boost::headers
+  PUBLIC
-	CURL::libcurl
+  CURL::libcurl
-	libzip::zip
-	OpenSSL::Crypto
-	pugixml::pugixml
-	ZArchive::zarchive
 )
 
 if(ENABLE_WXWIDGETS AND UNIX AND NOT APPLE)
@@ -161,7 +157,7 @@ if(UNIX AND NOT APPLE)
 endif()
 if (ENABLE_WXWIDGETS)
 	# PUBLIC because wx/app.h is included in CemuApp.h
-	target_link_libraries(CemuWxGui PUBLIC wx::base wx::core wx::gl wx::propgrid wx::xrc)
+	target_link_libraries(CemuWxGui PUBLIC wxWidgets::wxWidgets)
 endif()
 
 if(WIN32)
@@ -170,4 +166,4 @@ endif()
 
 if(ALLOW_PORTABLE)
 	target_compile_definitions(CemuWxGui PRIVATE CEMU_ALLOW_PORTABLE)
-endif ()
+endif ()

src/imgui/CMakeLists.txt

@@ -22,10 +22,6 @@ target_sources(imguiImpl PRIVATE
 target_include_directories(imguiImpl PUBLIC "../../dependencies/imgui/")
 
 target_link_libraries(imguiImpl PRIVATE
-	CemuCafe
 	CemuCommon
 	CemuGui
-	CemuInput
-	CemuResource
-	CemuUtil
 )

src/input/CMakeLists.txt

@@ -88,16 +88,8 @@ endif ()
 target_include_directories(CemuInput PUBLIC "../")
 
 target_link_libraries(CemuInput PRIVATE
-	CemuCafe
 	CemuCommon
-	CemuConfig
 	CemuGui
-	CemuUtil
-	Boost::headers
-	Boost::program_options
-	glm::glm
-	pugixml::pugixml
-	SDL2::SDL2
 )
 
 if (ENABLE_HIDAPI)
@@ -106,4 +98,4 @@ endif()
 
 if (ENABLE_BLUEZ)
 	target_link_libraries(CemuInput PRIVATE bluez::bluez)
-endif ()
+endif ()

src/resource/CMakeLists.txt

@@ -22,4 +22,4 @@ target_sources(CemuResource PRIVATE CafeDefaultFont.cpp)
 
 target_include_directories(CemuResource PUBLIC "../")
 
-target_link_libraries(CemuResource PRIVATE CemuCommon CemuComponents)
+target_link_libraries(CemuResource PRIVATE CemuCommon)

src/util/CMakeLists.txt

@@ -92,9 +92,5 @@ set_property(TARGET CemuUtil PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CON
 target_include_directories(CemuUtil PUBLIC "../")
 
 target_link_libraries(CemuUtil PRIVATE
-	CemuCommon
+  CemuCommon
-	CemuConfig
-	Boost::headers
-	Boost::nowide
-	OpenSSL::Crypto
 )