mirror of
https://github.com/cemu-project/Cemu.git
synced 2025-12-12 10:37:02 +00:00
cmake: fix usages of target_link_libraries
This commit is contained in:
parent
f5b19278d1
commit
efaa33a337
11 changed files with 29 additions and 80 deletions
|
|
@ -138,7 +138,6 @@ target_link_libraries(CemuBin PRIVATE
|
||||||
CemuGui
|
CemuGui
|
||||||
CemuInput
|
CemuInput
|
||||||
CemuUtil
|
CemuUtil
|
||||||
OpenGL::GL
|
|
||||||
SDL2::SDL2
|
SDL2::SDL2
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -559,28 +559,17 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(CemuCafe PRIVATE
|
target_link_libraries(CemuCafe PRIVATE
|
||||||
CemuAudio
|
|
||||||
CemuCommon
|
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)
|
if (ENABLE_WAYLAND)
|
||||||
|
|
|
||||||
|
|
@ -43,17 +43,8 @@ set_property(TARGET CemuComponents PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$
|
||||||
target_include_directories(CemuComponents PUBLIC "../")
|
target_include_directories(CemuComponents PUBLIC "../")
|
||||||
|
|
||||||
target_link_libraries(CemuComponents PRIVATE
|
target_link_libraries(CemuComponents PRIVATE
|
||||||
CemuCafe
|
|
||||||
CemuCommon
|
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
|
# PUBLIC because fmt/format.h is included in ExpressionParser/ExpressionParser.h
|
||||||
|
|
|
||||||
|
|
@ -59,9 +59,6 @@ target_precompile_headers(CemuCommon PUBLIC precompiled.h)
|
||||||
target_include_directories(CemuCommon PUBLIC "../")
|
target_include_directories(CemuCommon PUBLIC "../")
|
||||||
|
|
||||||
target_link_libraries(CemuCommon PRIVATE
|
target_link_libraries(CemuCommon PRIVATE
|
||||||
CemuCafe
|
|
||||||
CemuConfig
|
|
||||||
CemuComponents
|
|
||||||
Boost::nowide
|
Boost::nowide
|
||||||
Boost::filesystem
|
Boost::filesystem
|
||||||
glm::glm
|
glm::glm
|
||||||
|
|
|
||||||
|
|
@ -31,11 +31,8 @@ endif()
|
||||||
target_include_directories(CemuAudio PUBLIC "../")
|
target_include_directories(CemuAudio PUBLIC "../")
|
||||||
|
|
||||||
target_link_libraries(CemuAudio PRIVATE
|
target_link_libraries(CemuAudio PRIVATE
|
||||||
CemuCafe
|
|
||||||
CemuGui
|
|
||||||
CemuCommon
|
CemuCommon
|
||||||
CemuConfig
|
CemuGui
|
||||||
CemuUtil
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_CUBEB)
|
if(ENABLE_CUBEB)
|
||||||
|
|
|
||||||
|
|
@ -16,11 +16,7 @@ set_property(TARGET CemuConfig PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<C
|
||||||
target_include_directories(CemuConfig PUBLIC "../")
|
target_include_directories(CemuConfig PUBLIC "../")
|
||||||
|
|
||||||
target_link_libraries(CemuConfig PRIVATE
|
target_link_libraries(CemuConfig PRIVATE
|
||||||
CemuCafe
|
|
||||||
CemuCommon
|
CemuCommon
|
||||||
CemuGui
|
CemuGui
|
||||||
CemuUtil
|
Boost::program_options
|
||||||
Boost::headers
|
|
||||||
Boost::program_options
|
|
||||||
pugixml::pugixml
|
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
add_library(CemuWxGui
|
add_library(CemuWxGui STATIC
|
||||||
canvas/IRenderCanvas.h
|
canvas/IRenderCanvas.h
|
||||||
canvas/OpenGLCanvas.cpp
|
canvas/OpenGLCanvas.cpp
|
||||||
canvas/OpenGLCanvas.h
|
canvas/OpenGLCanvas.h
|
||||||
|
|
@ -126,20 +126,16 @@ target_include_directories(CemuWxGui PUBLIC "../")
|
||||||
target_include_directories(CemuWxGui PUBLIC ${RAPIDJSON_INCLUDE_DIRS})
|
target_include_directories(CemuWxGui PUBLIC ${RAPIDJSON_INCLUDE_DIRS})
|
||||||
|
|
||||||
target_link_libraries(CemuWxGui PRIVATE
|
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)
|
if(ENABLE_WXWIDGETS AND UNIX AND NOT APPLE)
|
||||||
|
|
@ -161,7 +157,7 @@ if(UNIX AND NOT APPLE)
|
||||||
endif()
|
endif()
|
||||||
if (ENABLE_WXWIDGETS)
|
if (ENABLE_WXWIDGETS)
|
||||||
# PUBLIC because wx/app.h is included in CemuApp.h
|
# 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()
|
endif()
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
|
|
||||||
|
|
@ -22,10 +22,6 @@ target_sources(imguiImpl PRIVATE
|
||||||
target_include_directories(imguiImpl PUBLIC "../../dependencies/imgui/")
|
target_include_directories(imguiImpl PUBLIC "../../dependencies/imgui/")
|
||||||
|
|
||||||
target_link_libraries(imguiImpl PRIVATE
|
target_link_libraries(imguiImpl PRIVATE
|
||||||
CemuCafe
|
|
||||||
CemuCommon
|
CemuCommon
|
||||||
CemuGui
|
CemuGui
|
||||||
CemuInput
|
|
||||||
CemuResource
|
|
||||||
CemuUtil
|
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -88,16 +88,8 @@ endif ()
|
||||||
target_include_directories(CemuInput PUBLIC "../")
|
target_include_directories(CemuInput PUBLIC "../")
|
||||||
|
|
||||||
target_link_libraries(CemuInput PRIVATE
|
target_link_libraries(CemuInput PRIVATE
|
||||||
CemuCafe
|
|
||||||
CemuCommon
|
CemuCommon
|
||||||
CemuConfig
|
|
||||||
CemuGui
|
CemuGui
|
||||||
CemuUtil
|
|
||||||
Boost::headers
|
|
||||||
Boost::program_options
|
|
||||||
glm::glm
|
|
||||||
pugixml::pugixml
|
|
||||||
SDL2::SDL2
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if (ENABLE_HIDAPI)
|
if (ENABLE_HIDAPI)
|
||||||
|
|
|
||||||
|
|
@ -22,4 +22,4 @@ target_sources(CemuResource PRIVATE CafeDefaultFont.cpp)
|
||||||
|
|
||||||
target_include_directories(CemuResource PUBLIC "../")
|
target_include_directories(CemuResource PUBLIC "../")
|
||||||
|
|
||||||
target_link_libraries(CemuResource PRIVATE CemuCommon CemuComponents)
|
target_link_libraries(CemuResource PRIVATE CemuCommon)
|
||||||
|
|
|
||||||
|
|
@ -92,9 +92,5 @@ set_property(TARGET CemuUtil PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CON
|
||||||
target_include_directories(CemuUtil PUBLIC "../")
|
target_include_directories(CemuUtil PUBLIC "../")
|
||||||
|
|
||||||
target_link_libraries(CemuUtil PRIVATE
|
target_link_libraries(CemuUtil PRIVATE
|
||||||
CemuCommon
|
CemuCommon
|
||||||
CemuConfig
|
|
||||||
Boost::headers
|
|
||||||
Boost::nowide
|
|
||||||
OpenSSL::Crypto
|
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue