mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-04-10 07:38:56 +02:00
3d1a67af18
* zlib: 1.3.1.2 -> 1.3.2 * vulkan-validation-layers: 1.4.335.0 -> 1.4.341.0 * sirit: 1.0.3 -> 1.0.4 * httplib: 0.35.0 -> 0.37.0 * xbyak: 7.33.3 -> 7.35.2 * catch2: 3.12.0 -> 3.13.0 * vulkan-headers: 1.4.342 -> 1.4.345 * vulkan-utility-libraries: 1.4.342 -> 1.4.345 Also fixed a build error with newer xbyak. Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3664
89 lines
2.9 KiB
Diff
89 lines
2.9 KiB
Diff
From 509be32bbfa6eb95014860f7c9ea6d45c8ddaa56 Mon Sep 17 00:00:00 2001
|
|
From: crueter <crueter@eden-emu.dev>
|
|
Date: Sun, 8 Mar 2026 15:11:12 -0400
|
|
Subject: [PATCH] [cmake] Simplify zstd find logic, and support pre-existing
|
|
zstd target
|
|
|
|
Some deduplication work on the zstd required/if-available logic. Also
|
|
adds support for pre-existing `zstd::libzstd` which is useful for
|
|
projects that bundle their own zstd in a way that doesn't get caught by
|
|
`CONFIG`
|
|
|
|
Signed-off-by: crueter <crueter@eden-emu.dev>
|
|
---
|
|
CMakeLists.txt | 46 ++++++++++++++++++++++++++--------------------
|
|
1 file changed, 26 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 1874e36be0..8d31198006 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -241,28 +241,34 @@ endif()
|
|
# NOTE:
|
|
# zstd < 1.5.6 does not provide the CMake imported target `zstd::libzstd`.
|
|
# Older versions must be consumed via their pkg-config file.
|
|
-if(HTTPLIB_REQUIRE_ZSTD)
|
|
- find_package(zstd 1.5.6 CONFIG)
|
|
- if(NOT zstd_FOUND)
|
|
- find_package(PkgConfig REQUIRED)
|
|
- pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
|
|
- add_library(zstd::libzstd ALIAS PkgConfig::zstd)
|
|
- endif()
|
|
- set(HTTPLIB_IS_USING_ZSTD TRUE)
|
|
-elseif(HTTPLIB_USE_ZSTD_IF_AVAILABLE)
|
|
- find_package(zstd 1.5.6 CONFIG QUIET)
|
|
- if(NOT zstd_FOUND)
|
|
- find_package(PkgConfig QUIET)
|
|
- if(PKG_CONFIG_FOUND)
|
|
- pkg_check_modules(zstd QUIET IMPORTED_TARGET libzstd)
|
|
-
|
|
- if(TARGET PkgConfig::zstd)
|
|
+if (HTTPLIB_REQUIRE_ZSTD)
|
|
+ set(HTTPLIB_ZSTD_REQUESTED ON)
|
|
+ set(HTTPLIB_ZSTD_REQUIRED REQUIRED)
|
|
+elseif (HTTPLIB_USE_ZSTD_IF_AVAILABLE)
|
|
+ set(HTTPLIB_ZSTD_REQUESTED ON)
|
|
+ set(HTTPLIB_ZSTD_REQUIRED QUIET)
|
|
+endif()
|
|
+
|
|
+if (HTTPLIB_ZSTD_REQUESTED)
|
|
+ if (TARGET zstd::libzstd)
|
|
+ set(HTTPLIB_IS_USING_ZSTD TRUE)
|
|
+ else()
|
|
+ find_package(zstd 1.5.6 CONFIG QUIET)
|
|
+
|
|
+ if (NOT zstd_FOUND)
|
|
+ find_package(PkgConfig ${HTTPLIB_ZSTD_REQUIRED})
|
|
+ pkg_check_modules(zstd ${HTTPLIB_ZSTD_REQUIRED} IMPORTED_TARGET libzstd)
|
|
+
|
|
+ if (TARGET PkgConfig::zstd)
|
|
add_library(zstd::libzstd ALIAS PkgConfig::zstd)
|
|
endif()
|
|
endif()
|
|
+
|
|
+ # This will always be true if zstd is required.
|
|
+ # If zstd *isn't* found when zstd is set to required,
|
|
+ # CMake will error out earlier in this block.
|
|
+ set(HTTPLIB_IS_USING_ZSTD ${zstd_FOUND})
|
|
endif()
|
|
- # Both find_package and PkgConf set a XXX_FOUND var
|
|
- set(HTTPLIB_IS_USING_ZSTD ${zstd_FOUND})
|
|
endif()
|
|
|
|
# Used for default, common dirs that the end-user can change (if needed)
|
|
@@ -317,13 +323,13 @@ if(HTTPLIB_COMPILE)
|
|
$<BUILD_INTERFACE:${_httplib_build_includedir}/httplib.h>
|
|
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/httplib.h>
|
|
)
|
|
-
|
|
+
|
|
# Add C++20 module support if requested
|
|
# Include from separate file to prevent parse errors on older CMake versions
|
|
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.28")
|
|
include(cmake/modules.cmake)
|
|
endif()
|
|
-
|
|
+
|
|
set_target_properties(${PROJECT_NAME}
|
|
PROPERTIES
|
|
VERSION ${${PROJECT_NAME}_VERSION}
|