scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(cmake): simplify Protobuf target handling in dependencies.cmake

Browse Source 
- Refactored the logic for appending Protobuf targets to streamline the configuration.
- Removed unnecessary checks and consolidated target handling for improved clarity and maintainability.
- Introduced YAZE_PROTOBUF_WHOLEARCHIVE_TARGETS to facilitate linking without "lite" variants.

Benefits:
- Enhances the organization of CMake configurations, leading to a more efficient build process.
This commit is contained in:
scawful
2025-10-14 22:53:14 -04:00
parent 2f84879ca9
commit 0127913ff9
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmake/dependencies.cmake
View File

@@ -89,15 +89,13 @@ set(YAZE_PROTOBUF_TARGETS)
if(TARGET protobuf::libprotobuf) if(TARGET protobuf::libprotobuf)
list(APPEND YAZE_PROTOBUF_TARGETS protobuf::libprotobuf) list(APPEND YAZE_PROTOBUF_TARGETS protobuf::libprotobuf)
elseif(TARGET libprotobuf) else()
list(APPEND YAZE_PROTOBUF_TARGETS libprotobuf) if(TARGET libprotobuf)
list(APPEND YAZE_PROTOBUF_TARGETS libprotobuf)
endif()
endif() endif()
if(TARGET protobuf::libprotobuf-lite) set(YAZE_PROTOBUF_WHOLEARCHIVE_TARGETS ${YAZE_PROTOBUF_TARGETS})
list(APPEND YAZE_PROTOBUF_TARGETS protobuf::libprotobuf-lite)
elseif(TARGET libprotobuf-lite)
list(APPEND YAZE_PROTOBUF_TARGETS libprotobuf-lite)
endif()
if(YAZE_PROTOBUF_TARGETS) if(YAZE_PROTOBUF_TARGETS)
list(GET YAZE_PROTOBUF_TARGETS 0 YAZE_PROTOBUF_TARGET) list(GET YAZE_PROTOBUF_TARGETS 0 YAZE_PROTOBUF_TARGET)
@@ -105,13 +103,6 @@ else()
set(YAZE_PROTOBUF_TARGET "") set(YAZE_PROTOBUF_TARGET "")
endif() endif()
set(YAZE_PROTOBUF_WHOLEARCHIVE_TARGETS)
foreach(_yaze_proto_candidate IN LISTS YAZE_PROTOBUF_TARGETS)
if(NOT _yaze_proto_candidate MATCHES "lite")
list(APPEND YAZE_PROTOBUF_WHOLEARCHIVE_TARGETS ${_yaze_proto_candidate})
endif()
endforeach()
# SDL2 # SDL2
include(cmake/sdl2.cmake) include(cmake/sdl2.cmake)