[cmake] fix zstd (force pkgconfig, thanks facebook)

Signed-off-by: crueter <crueter@eden-emu.dev>

CMakeLists.txt

@@ -439,6 +439,10 @@ if (YUZU_USE_CPM)
     # zstd
     AddJsonPackage(zstd)
 
+    if (zstd_ADDED)
+        add_library(zstd::zstd ALIS libzstd_static)
+    endif()
+
     # Catch2
     if (YUZU_TESTS OR DYNARMIC_TESTS)
         AddJsonPackage(catch2)
@@ -464,7 +468,7 @@ else()
     find_package(enet 1.3 MODULE REQUIRED)
     find_package(Opus 1.3 MODULE REQUIRED)
     find_package(ZLIB 1.2 REQUIRED)
-    find_package(zstd 1.5 REQUIRED)
+    find_package(zstd 1.5 REQUIRED MODULE)
 
     if (YUZU_TESTS)
         find_package(Catch2 3.0.1 REQUIRED)

CMakeModules/CPMUtil.cmake

@@ -20,7 +20,7 @@ endif()
 option(CPMUTIL_FORCE_BUNDLED
     "Force bundled packages for all CPM depdendencies" ${BUNDLED_DEFAULT})
 
-option(CPMUTIL_DEFAULT_SYSTEM
+option(CPMUTIL_FORCE_SYSTEM
     "Force system packages for all CPM dependencies (NOT RECOMMENDED)" OFF)
 
 cmake_minimum_required(VERSION 3.22)

CMakeModules/Findzstd.cmake

@@ -3,17 +3,12 @@
 
 include(FindPackageHandleStandardArgs)
 
-find_package(zstd QUIET CONFIG)
-if (zstd_CONSIDERED_CONFIGS)
-    find_package_handle_standard_args(zstd CONFIG_MODE)
-else()
 find_package(PkgConfig QUIET)
 pkg_search_module(ZSTD QUIET IMPORTED_TARGET libzstd)
 find_package_handle_standard_args(zstd
     REQUIRED_VARS ZSTD_LINK_LIBRARIES
     VERSION_VAR ZSTD_VERSION
 )
-endif()
 
 if (zstd_FOUND AND NOT TARGET zstd::zstd)
     if (TARGET zstd::libzstd_shared)

src/common/CMakeLists.txt

@@ -272,13 +272,7 @@ if (lz4_ADDED)
 endif()
 
 target_link_libraries(common PUBLIC fmt::fmt stb::headers Threads::Threads)
-target_link_libraries(common PRIVATE lz4::lz4 LLVM::Demangle)
-
-if (TARGET libzstd_static)
-  target_link_libraries(common PRIVATE libzstd_static)
-else()
-  target_link_libraries(common PRIVATE zstd)
-endif()
+target_link_libraries(common PRIVATE lz4::lz4 LLVM::Demangle zstd::zstd)
 
 if (TARGET unordered_dense::unordered_dense)
   # weird quirk of system installs