Merge pull request #11331 from orbea/snappy

Allow choosing to use the system snappy or not.
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2018-08-26 23:02:49 +02:00
commit 4cb230dfd7
2 files changed
+2 -1

No files matched your search

+1
View File
@@ -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})
+1 -1
View File
@@ -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)