Merge pull request #11331 from orbea/snappy

Allow choosing to use the system snappy or not.
hrydgard · Aug 26, 2018 · 4cb230d · 4cb230d
2 parents 200ec73 + 8ba1f04
commit 4cb230d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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)