From 382692d068d5b034518b89de69f013ab92c28857 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Sun, 9 Feb 2025 13:31:41 +0300 Subject: [PATCH] Add option to use vendored vs. system dependencies --- .github/workflows/ci-build.yml | 2 ++ CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index aa9e368c..425aa242 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -176,6 +176,7 @@ jobs: -B build \ -D CMAKE_BUILD_TYPE=RelWithDebInfo \ -D CMAKE_TOOLCHAIN_FILE=cmake/toolchain/Linux32.cmake \ + -D FALLOUT_VENDORED=OFF \ # EOL - name: Configure (x64) @@ -184,6 +185,7 @@ jobs: cmake \ -B build \ -D CMAKE_BUILD_TYPE=RelWithDebInfo \ + -D FALLOUT_VENDORED=OFF \ # EOL - name: Build diff --git a/CMakeLists.txt b/CMakeLists.txt index b237959a..17fcf1e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,8 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_EXTENSIONS NO) +option(FALLOUT_VENDORED "Use vendored third-party libraries" ON) + if(ANDROID) add_library(${EXECUTABLE_NAME} SHARED) else() @@ -363,7 +365,7 @@ endif() add_subdirectory("third_party/fpattern") target_link_libraries(${EXECUTABLE_NAME} fpattern::fpattern) -if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")) +if(FALLOUT_VENDORED) add_subdirectory("third_party/zlib") add_subdirectory("third_party/sdl2") else()