From 0d72cfcaddd74f98b43e0537b3b6fddca1ca92d7 Mon Sep 17 00:00:00 2001 From: Justin Scofield <47263509+scawful@users.noreply.github.com> Date: Sun, 7 Aug 2022 13:21:52 -0400 Subject: [PATCH] chore: move absl_targets cmake def up a level --- CMakeLists.txt | 15 +++++++++++++++ src/CMakeLists.txt | 16 ---------------- test/CMakeLists.txt | 17 +++-------------- 3 files changed, 18 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 319d028e..60a96e32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,21 @@ set(ABSL_PROPAGATE_CXX_STD ON) set(ABSL_CXX_STANDARD 17) set(ABSL_USE_GOOGLETEST_HEAD ON) set(ABSL_ENABLE_INSTALL ON) +set( + ABSL_TARGETS + absl::strings + absl::flags + absl::status + absl::statusor + absl::examine_stack + absl::stacktrace + absl::base + absl::config + absl::core_headers + absl::raw_logging_internal + absl::failure_signal_handler + absl::flat_hash_map +) # Video Libraries ------------------------------------------------------------- find_package(PNG REQUIRED) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 352c51bd..bd7b2ee1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -113,22 +113,6 @@ target_include_directories( lib/asar/src/asar-dll-bindings/c ) -set( - ABSL_TARGETS - absl::strings - absl::flags - absl::status - absl::statusor - absl::examine_stack - absl::stacktrace - absl::base - absl::config - absl::core_headers - absl::raw_logging_internal - absl::failure_signal_handler - absl::flat_hash_map -) - set(SDL_TARGETS SDL2::SDL2) if(WIN32 OR MINGW) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e07853dd..0b83417e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -25,29 +25,18 @@ add_executable( target_include_directories( yaze_test PUBLIC - ../src/lib/ ../src/ - ${SDL_INCLUDE_DIRS} + ../src/lib/ ../src/lib/asar/src/asar-dll-bindings/c + ${SDL_INCLUDE_DIRS} ) target_link_libraries( yaze_test - absl::strings - absl::flags - absl::status - absl::statusor - absl::failure_signal_handler - absl::examine_stack - absl::stacktrace - absl::base - absl::config - absl::core_headers - absl::raw_logging_internal SDL2::SDL2 + ${ABSL_TARGETS} ${OPENGL_LIBRARIES} ${CMAKE_DL_LIBS} - asar-static gmock_main gmock gtest_main