Attachment 214676 Details for Bug 246592 – Snappy static lib patch

Snappy static lib patch

patch-CMakeLists.txt (text/plain), 1.96 KB, created by Mitchell Holland on 2020-05-20 04:45:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mitchell Holland

Created: 2020-05-20 04:45:57 UTC

Size: 1.96 KB

patch

obsolete

>--- CMakeLists.txt.orig	2020-01-14 18:58:53 UTC
>+++ CMakeLists.txt
>@@ -166,8 +166,7 @@ configure_file(
>   "snappy-stubs-public.h.in"
>   "${PROJECT_BINARY_DIR}/snappy-stubs-public.h")
> 
>-add_library(snappy "")
>-target_sources(snappy
>+set(SNAPPY_SRCS
>   PRIVATE
>     "snappy-internal.h"
>     "snappy-stubs-internal.h"
>@@ -188,20 +187,37 @@ target_sources(snappy
>     $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/snappy-stubs-public.h>
>     $<INSTALL_INTERFACE:include/snappy-stubs-public.h>
> )
>-target_include_directories(snappy
>+set(SNAPPY_INCS
>   PUBLIC
>     $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
>     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
>     $<INSTALL_INTERFACE:include>
> )
>+
>+add_library(snappy SHARED)
>+target_sources(snappy ${SNAPPY_SRCS})
>+target_include_directories(snappy ${SNAPPY_INCS})
> set_target_properties(snappy
>   PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
> 
> target_compile_definitions(snappy PRIVATE -DHAVE_CONFIG_H)
>-if(BUILD_SHARED_LIBS)
>-  set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
>-endif(BUILD_SHARED_LIBS)
>+set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
> 
>+add_library(snappy-static STATIC)
>+target_sources(snappy-static ${SNAPPY_SRCS})
>+target_include_directories(snappy-static ${SNAPPY_INCS})
>+set_target_properties(snappy-static
>+  PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
>+
>+target_compile_definitions(snappy-static PRIVATE -DHAVE_CONFIG_H)
>+
>+if (MSVC)
>+    set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy-static)
>+else()
>+    set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy)
>+endif()
>+
>+
> if(SNAPPY_BUILD_TESTS)
>   enable_testing()
> 
>@@ -258,7 +274,7 @@ endif(SNAPPY_FUZZING_BUILD)
> include(GNUInstallDirs)
> 
> if(SNAPPY_INSTALL)
>-  install(TARGETS snappy
>+  install(TARGETS snappy snappy-static
>     EXPORT SnappyTargets
>     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
>     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

Actions: View

Attachments on bug 246592: 214676