From a9f0b8eb9c57760112d98461695cab1fa63b1f4f Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 1 Nov 2025 11:32:16 -0400 Subject: [PATCH] chore: update CMake dependency configurations to remove PARENT_SCOPE - Removed PARENT_SCOPE from various dependency target definitions in CMake files (grpc.cmake, imgui.cmake, sdl2.cmake, testing.cmake, yaml.cmake). - Ensured that all targets are set locally for better clarity and management. Benefits: - Simplifies the dependency management process and improves the readability of CMake configurations. --- cmake/dependencies.cmake | 2 +- cmake/dependencies/grpc.cmake | 3 --- cmake/dependencies/imgui.cmake | 1 - cmake/dependencies/sdl2.cmake | 3 --- cmake/dependencies/testing.cmake | 3 +-- cmake/dependencies/yaml.cmake | 2 +- 6 files changed, 3 insertions(+), 11 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index e9737eba..c51bec5c 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -76,4 +76,4 @@ endif() message(STATUS "=================================") # Export all dependency targets for use in other CMake files -set(YAZE_ALL_DEPENDENCIES ${YAZE_ALL_DEPENDENCIES} PARENT_SCOPE) \ No newline at end of file +set(YAZE_ALL_DEPENDENCIES ${YAZE_ALL_DEPENDENCIES}) \ No newline at end of file diff --git a/cmake/dependencies/grpc.cmake b/cmake/dependencies/grpc.cmake index 1dcb942f..44f2e240 100644 --- a/cmake/dependencies/grpc.cmake +++ b/cmake/dependencies/grpc.cmake @@ -113,7 +113,6 @@ set(ABSL_TARGETS absl::str_format absl::synchronization absl::time - PARENT_SCOPE ) # Export gRPC targets for use in other CMake files @@ -123,7 +122,6 @@ set(YAZE_GRPC_TARGETS protobuf::libprotobuf protoc grpc_cpp_plugin - PARENT_SCOPE ) message(STATUS "gRPC setup complete - targets available: ${YAZE_GRPC_TARGETS}") @@ -152,7 +150,6 @@ message(STATUS "Protobuf include dir: ${_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR}") # Export protobuf targets set(YAZE_PROTOBUF_TARGETS protobuf::libprotobuf - PARENT_SCOPE ) # Function to add protobuf/gRPC code generation to a target diff --git a/cmake/dependencies/imgui.cmake b/cmake/dependencies/imgui.cmake index e01ce67d..202b7e92 100644 --- a/cmake/dependencies/imgui.cmake +++ b/cmake/dependencies/imgui.cmake @@ -67,7 +67,6 @@ if(YAZE_BUILD_TESTS) endif() # Export ImGui targets for use in other CMake files -set(YAZE_IMGUI_TARGETS ImGui PARENT_SCOPE) set(YAZE_IMGUI_TARGETS ImGui) message(STATUS "Dear ImGui setup complete - YAZE_IMGUI_TARGETS = ${YAZE_IMGUI_TARGETS}") diff --git a/cmake/dependencies/sdl2.cmake b/cmake/dependencies/sdl2.cmake index 2ef88136..a01ca7fd 100644 --- a/cmake/dependencies/sdl2.cmake +++ b/cmake/dependencies/sdl2.cmake @@ -96,9 +96,6 @@ elseif(UNIX) endif() # Export SDL2 targets for use in other CMake files -# Use PARENT_SCOPE to set in the calling scope (dependencies.cmake) -set(YAZE_SDL2_TARGETS yaze_sdl2 PARENT_SCOPE) -# Also set locally for use in this file set(YAZE_SDL2_TARGETS yaze_sdl2) message(STATUS "SDL2 setup complete - YAZE_SDL2_TARGETS = ${YAZE_SDL2_TARGETS}") diff --git a/cmake/dependencies/testing.cmake b/cmake/dependencies/testing.cmake index d3e5f3cc..497cbfd6 100644 --- a/cmake/dependencies/testing.cmake +++ b/cmake/dependencies/testing.cmake @@ -47,7 +47,7 @@ if(YAZE_ENABLE_COVERAGE OR DEFINED ENV{YAZE_ENABLE_BENCHMARKS}) message(FATAL_ERROR "Benchmark target not found after CPM fetch") endif() - set(YAZE_BENCHMARK_TARGETS benchmark::benchmark PARENT_SCOPE) + set(YAZE_BENCHMARK_TARGETS benchmark::benchmark) endif() # Create convenience targets for the rest of the project @@ -64,7 +64,6 @@ if(TARGET benchmark::benchmark) endif() # Export testing targets for use in other CMake files -set(YAZE_TESTING_TARGETS yaze_testing PARENT_SCOPE) set(YAZE_TESTING_TARGETS yaze_testing) message(STATUS "Testing dependencies setup complete - GTest + GMock available") diff --git a/cmake/dependencies/yaml.cmake b/cmake/dependencies/yaml.cmake index 1b731423..b75faad2 100644 --- a/cmake/dependencies/yaml.cmake +++ b/cmake/dependencies/yaml.cmake @@ -13,7 +13,7 @@ if(YAZE_USE_SYSTEM_DEPS) message(STATUS "Using system yaml-cpp") add_library(yaze_yaml INTERFACE IMPORTED) target_link_libraries(yaze_yaml INTERFACE yaml-cpp) - set(YAZE_YAML_TARGETS yaze_yaml PARENT_SCOPE) + set(YAZE_YAML_TARGETS yaze_yaml) return() endif() endif()