Skip to content

Commit 3dcf216

Browse files
committed
ARROW-1275: [C++] Deafult Snappy static lib suffix updated to "_static"
1 parent 676a4a9 commit 3dcf216

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
165165
if (MSVC)
166166
set(BROTLI_MSVC_STATIC_LIB_SUFFIX "_static" CACHE STRING
167167
"Brotli static lib suffix used on Windows with MSVC (default _static)")
168-
set(SNAPPY_MSVC_STATIC_LIB_SUFFIX "" CACHE STRING
168+
set(SNAPPY_MSVC_STATIC_LIB_SUFFIX "_static" CACHE STRING
169169
"Snappy static lib suffix used on Windows with MSVC (default is empty string)")
170170
set(ZLIB_MSVC_STATIC_LIB_SUFFIX "libstatic" CACHE STRING
171171
"Zlib static lib suffix used on Windows with MSVC (default libstatic)")

cpp/cmake_modules/SnappyCMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ set(SNAPPY_SRCS snappy.cc
6868
snappy-stubs-public.h)
6969

7070
add_library(snappy SHARED ${SNAPPY_SRCS})
71-
add_library(snappystatic STATIC ${SNAPPY_SRCS})
71+
add_library(snappy_static STATIC ${SNAPPY_SRCS})
7272

7373
TARGET_COMPILE_DEFINITIONS(snappy PRIVATE -DHAVE_CONFIG_H)
74-
TARGET_COMPILE_DEFINITIONS(snappystatic PRIVATE -DHAVE_CONFIG_H)
74+
TARGET_COMPILE_DEFINITIONS(snappy_static PRIVATE -DHAVE_CONFIG_H)
7575

7676
install(FILES snappy.h
7777
snappy-c.h
7878
snappy-sinksource.h
7979
${snappy_BINARY_DIR}/snappy-stubs-public.h
8080
DESTINATION include)
8181

82-
install(TARGETS snappy snappystatic
82+
install(TARGETS snappy snappy_static
8383
RUNTIME DESTINATION bin
8484
LIBRARY DESTINATION lib
8585
ARCHIVE DESTINATION lib)

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ if (ARROW_WITH_SNAPPY)
501501
set(SNAPPY_HOME "${SNAPPY_PREFIX}")
502502
set(SNAPPY_INCLUDE_DIR "${SNAPPY_PREFIX}/include")
503503
if (MSVC)
504-
set(SNAPPY_STATIC_LIB_NAME snappystatic)
504+
set(SNAPPY_STATIC_LIB_NAME snappy_static)
505505
else()
506506
set(SNAPPY_STATIC_LIB_NAME snappy)
507507
endif()

0 commit comments

Comments
 (0)