From 8ba1f049dae9772cdfc32496899ffdd8d3186ff7 Mon Sep 17 00:00:00 2001 From: orbea Date: Sun, 26 Aug 2018 12:59:02 -0700 Subject: [PATCH] Allow choosing to use the system snappy or not. --- CMakeLists.txt | 1 + ext/snappy/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 010b77f441..807923eae2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,6 +124,7 @@ option(SIMULATOR "Set to ON when targeting an x86 simulator of an ARM platform" option(LIBRETRO "Set to ON to generate the libretro target" OFF) # :: Options option(USE_FFMPEG "Build with FFMPEG support" ${USE_FFMPEG}) +option(USE_SYSTEM_SNAPPY "Dynamically link against system snappy" ${USE_SYSTEM_SNAPPY}) option(USE_SYSTEM_FFMPEG "Dynamically link against system FFMPEG" ${USE_SYSTEM_FFMPEG}) option(USE_SYSTEM_LIBZIP "Dynamically link against system libzip" ${USE_SYSTEM_LIBZIP}) option(USE_WAYLAND_WSI "Set to ON to require Wayland support for Vulkan" ${USE_WAYLAND_WSI}) diff --git a/ext/snappy/CMakeLists.txt b/ext/snappy/CMakeLists.txt index fb1ed966c4..6ab38acd0e 100644 --- a/ext/snappy/CMakeLists.txt +++ b/ext/snappy/CMakeLists.txt @@ -1,6 +1,6 @@ find_package(Snappy) -if(SNAPPY_FOUND) +if(SNAPPY_FOUND AND USE_SYSTEM_SNAPPY) add_library(system_snappy INTERFACE) add_library(Ext::Snappy ALIAS system_snappy) target_link_libraries(system_snappy INTERFACE Snappy::Snappy)