cmake: Adjust link libraries to vcpkg produced targets

CMakeLists.txt

@@ -149,14 +149,18 @@ find_package(cryptopp CONFIG REQUIRED)
 
 # Xbyak
 if (ARCHITECTURE_x86_64)
-    find_package(xbyak REQUIRED CONFIG)
+    find_package(xbyak CONFIG REQUIRED)
 endif()
 
 # libfmt
 find_package(fmt CONFIG REQUIRED)
 
+# Glad/Glm
+find_package(glad CONFIG REQUIRED)
+find_package(glm CONFIG REQUIRED)
+
 # Zstandard
-find_package(ZSTD CONFIG REQUIRED)
+find_package(zstd CONFIG REQUIRED)
 
 # ENet
 find_package(unofficial-enet CONFIG REQUIRED)
@@ -179,16 +183,16 @@ if (ENABLE_WEB_SERVICE)
     target_include_directories(httplib INTERFACE ${CPP_HTTPLIB_INCLUDE_DIRS})
 
     # cpp-jwt
-    find_package(cpp-jwt REQUIRED)
+    find_package(cpp-jwt CONFIG REQUIRED)
 endif()
 
 # lodepng
-find_package(lodepng REQUIRED)
+find_package(lodepng CONFIG REQUIRED)
 
 # (xperia64): Only use libyuv on Android b/c of build issues on Windows and mandatory JPEG
 if(ANDROID)
     # libyuv
-    find_package(yuv CONFIG REQUIRED)
+    find_package(libyuv CONFIG REQUIRED)
 endif()
 
 # Prefer the -pthread flag on Linux.
@@ -245,10 +249,7 @@ if (ENABLE_FFMPEG_VIDEO_DUMPER)
 endif()
 
 if (ENABLE_FDK)
-    find_library(FDK_AAC fdk-aac DOC "The path to fdk_aac library")
+    find_package(fdk-aac CONFIG REQUIRED)
-    if(FDK_AAC STREQUAL "FDK_AAC-NOTFOUND")
-        message(FATAL_ERROR "fdk_aac library not found.")
-    endif()
 endif()
 # Platform-specific library requirements
 # ======================================

src/audio_core/CMakeLists.txt

@@ -67,7 +67,7 @@ elseif(ENABLE_FDK)
         hle/fdk_decoder.cpp
         hle/fdk_decoder.h
     )
-    target_link_libraries(audio_core PRIVATE ${FDK_AAC})
+    target_link_libraries(audio_core PRIVATE FDK-AAC::fdk-aac)
     target_compile_definitions(audio_core PUBLIC HAVE_FDK)
 endif()
 
@@ -80,7 +80,7 @@ if(ANDROID)
 endif()
 
 if(SDL2_FOUND)
-    target_link_libraries(audio_core PRIVATE SDL2)
+    target_link_libraries(audio_core PRIVATE SDL2::SDL2)
     target_compile_definitions(audio_core PRIVATE HAVE_SDL2)
 endif()
 

src/citra/CMakeLists.txt

@@ -16,11 +16,11 @@ add_executable(citra
 create_target_directory_groups(citra)
 
 target_link_libraries(citra PRIVATE common core input_common network)
-target_link_libraries(citra PRIVATE inih glad lodepng)
+target_link_libraries(citra PRIVATE inih glad::glad lodepng)
 if (MSVC)
     target_link_libraries(citra PRIVATE getopt)
 endif()
-target_link_libraries(citra PRIVATE ${PLATFORM_LIBRARIES} SDL2 Threads::Threads)
+target_link_libraries(citra PRIVATE ${PLATFORM_LIBRARIES} SDL2::SDL2 Threads::Threads)
 
 if(UNIX AND NOT APPLE)
     install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")

src/citra_qt/CMakeLists.txt

@@ -259,7 +259,7 @@ endif()
 create_target_directory_groups(citra-qt)
 
 target_link_libraries(citra-qt PRIVATE audio_core common core input_common network video_core)
-target_link_libraries(citra-qt PRIVATE Boost::boost glad nihstro-headers Qt5::Widgets Qt5::Multimedia)
+target_link_libraries(citra-qt PRIVATE Boost::boost glad::glad nihstro-headers Qt5::Widgets Qt5::Multimedia)
 target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     target_include_directories(citra-qt PRIVATE ${Qt5Gui_PRIVATE_INCLUDE_DIRS})

src/common/CMakeLists.txt

@@ -132,7 +132,7 @@ endif()
 create_target_directory_groups(common)
 
 target_link_libraries(common PUBLIC fmt::fmt microprofile Boost::boost Boost::serialization)
-target_link_libraries(common PRIVATE libzstd_static)
+target_link_libraries(common PRIVATE zstd::libzstd_shared)
 if (ARCHITECTURE_x86_64)
-    target_link_libraries(common PRIVATE xbyak)
+    target_link_libraries(common PRIVATE xbyak::xbyak)
 endif()

src/core/CMakeLists.txt

@@ -473,7 +473,7 @@ endif()
 create_target_directory_groups(core)
 
 target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core)
-target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp fmt open_source_archives Boost::serialization)
+target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp-static fmt::fmt open_source_archives Boost::serialization)
 
 if (ENABLE_WEB_SERVICE)
     target_compile_definitions(core PRIVATE -DENABLE_WEB_SERVICE -DCPPHTTPLIB_OPENSSL_SUPPORT)

src/dedicated_room/CMakeLists.txt

@@ -13,7 +13,7 @@ if (ENABLE_WEB_SERVICE)
     target_link_libraries(citra-room PRIVATE web_service)
 endif()
 
-target_link_libraries(citra-room PRIVATE cryptopp glad)
+target_link_libraries(citra-room PRIVATE cryptopp-static glad::glad)
 if (MSVC)
     target_link_libraries(citra-room PRIVATE getopt)
 endif()

src/input_common/CMakeLists.txt

@@ -28,7 +28,7 @@ if(SDL2_FOUND)
         sdl/sdl_impl.cpp
         sdl/sdl_impl.h
     )
-    target_link_libraries(input_common PRIVATE SDL2)
+    target_link_libraries(input_common PRIVATE SDL2::SDL2)
     target_compile_definitions(input_common PRIVATE HAVE_SDL2)
 endif()
 

src/network/CMakeLists.txt

@@ -13,4 +13,4 @@ add_library(network STATIC
 
 create_target_directory_groups(network)
 
-target_link_libraries(network PRIVATE common enet Boost::serialization)
+target_link_libraries(network PRIVATE common unofficial-enet Boost::serialization)

src/video_core/CMakeLists.txt

@@ -174,9 +174,8 @@ endif()
 
 create_target_directory_groups(video_core)
 
-find_package(glad CONFIG REQUIRED)
 target_link_libraries(video_core PUBLIC common core)
-target_link_libraries(video_core PRIVATE glad::glad nihstro-headers Boost::serialization)
+target_link_libraries(video_core PRIVATE glad::glad glm::glm nihstro-headers Boost::serialization)
 
 # Include Vulkan headers
 target_include_directories(video_core PRIVATE ../../externals/Vulkan-Headers/include)

src/web_service/CMakeLists.txt

@@ -14,7 +14,7 @@ add_library(web_service STATIC
 create_target_directory_groups(web_service)
 
 target_compile_definitions(web_service PRIVATE -DCPPHTTPLIB_OPENSSL_SUPPORT)
-target_link_libraries(web_service PRIVATE common network nlohmann_json::nlohmann_json ${OPENSSL_LIBS} httplib cpp-jwt)
+target_link_libraries(web_service PRIVATE common network nlohmann_json::nlohmann_json ${OPENSSL_LIBS} httplib cpp-jwt::cpp-jwt)
 if (ANDROID)
     target_link_libraries(web_service PRIVATE ifaddrs)
 elseif(WIN32)