Skip to content

Commit 459db21

Browse files
committed
Win fixes for CMake library resolution
1 parent 1d2cba0 commit 459db21

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

cpp/cmake_modules/FindSnappyAlt.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@ if(ARROW_SNAPPY_USE_SHARED)
7575
"${CMAKE_SHARED_LIBRARY_PREFIX}snappy${CMAKE_SHARED_LIBRARY_SUFFIX}")
7676
else()
7777
set(SNAPPY_STATIC_LIB_NAME_BASE "snappy")
78-
if(MSVC)
79-
set(SNAPPY_STATIC_LIB_NAME_BASE
80-
"${SNAPPY_STATIC_LIB_NAME_BASE}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}")
81-
endif()
8278
set(SNAPPY_LIB_NAMES
8379
"${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_STATIC_LIB_NAME_BASE}${CMAKE_STATIC_LIBRARY_SUFFIX}"
8480
)

cpp/cmake_modules/Findutf8proc.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ if(ARROW_UTF8PROC_USE_SHARED)
7373
list(APPEND utf8proc_LIB_NAMES
7474
"${CMAKE_SHARED_LIBRARY_PREFIX}utf8proc${CMAKE_SHARED_LIBRARY_SUFFIX}")
7575
else()
76-
if(MSVC AND NOT DEFINED utf8proc_MSVC_STATIC_LIB_SUFFIX)
77-
set(utf8proc_MSVC_STATIC_LIB_SUFFIX "_static")
78-
endif()
7976
set(utf8proc_STATIC_LIB_SUFFIX
8077
"${utf8proc_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
8178
set(utf8proc_LIB_NAMES

0 commit comments

Comments
 (0)