Skip to content

ARROW-1275: [C++] Deafult Snappy static lib suffix updated to "_static" #894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maxhora wants to merge 1 commit into from
Closed

ARROW-1275: [C++] Deafult Snappy static lib suffix updated to "_static" #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
if (MSVC)
set(BROTLI_MSVC_STATIC_LIB_SUFFIX "_static" CACHE STRING
"Brotli static lib suffix used on Windows with MSVC (default _static)")
set(SNAPPY_MSVC_STATIC_LIB_SUFFIX "" CACHE STRING
set(SNAPPY_MSVC_STATIC_LIB_SUFFIX "_static" CACHE STRING
"Snappy static lib suffix used on Windows with MSVC (default is empty string)")
set(ZLIB_MSVC_STATIC_LIB_SUFFIX "libstatic" CACHE STRING
"Zlib static lib suffix used on Windows with MSVC (default libstatic)")
Expand Down
6 changes: 3 additions & 3 deletions cpp/cmake_modules/SnappyCMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,18 @@ set(SNAPPY_SRCS snappy.cc
snappy-stubs-public.h)

add_library(snappy SHARED ${SNAPPY_SRCS})
add_library(snappystatic STATIC ${SNAPPY_SRCS})
add_library(snappy_static STATIC ${SNAPPY_SRCS})

TARGET_COMPILE_DEFINITIONS(snappy PRIVATE -DHAVE_CONFIG_H)
TARGET_COMPILE_DEFINITIONS(snappystatic PRIVATE -DHAVE_CONFIG_H)
TARGET_COMPILE_DEFINITIONS(snappy_static PRIVATE -DHAVE_CONFIG_H)

install(FILES snappy.h
snappy-c.h
snappy-sinksource.h
${snappy_BINARY_DIR}/snappy-stubs-public.h
DESTINATION include)

install(TARGETS snappy snappystatic
install(TARGETS snappy snappy_static
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
2 changes: 1 addition & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ if (ARROW_WITH_SNAPPY)
set(SNAPPY_HOME "${SNAPPY_PREFIX}")
set(SNAPPY_INCLUDE_DIR "${SNAPPY_PREFIX}/include")
if (MSVC)
set(SNAPPY_STATIC_LIB_NAME snappystatic)
set(SNAPPY_STATIC_LIB_NAME snappy_static)
else()
set(SNAPPY_STATIC_LIB_NAME snappy)
endif()
Expand Down