Skip to content

Commit 4b424a0

Browse files
committed
Remove BOOST_SOURCE=BUNDLED to use vcpkg's dynamic link to boost
Since we need to use link to boost dynamically, we need to remove the bundled boost library flag. Add debug messages.
1 parent 34f3712 commit 4b424a0

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/workflows/cpp_windows.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565
ARROW_WITH_SNAPPY: ON
6666
ARROW_WITH_ZLIB: ON
6767
ARROW_WITH_ZSTD: ON
68-
BOOST_SOURCE: BUNDLED
6968
CMAKE_CXX_STANDARD: "17"
7069
CMAKE_GENERATOR: Ninja
7170
CMAKE_INSTALL_PREFIX: /usr

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,14 +1269,19 @@ else()
12691269
endif()
12701270

12711271
if(ARROW_USE_BOOST)
1272+
message(status "-AL- ARROW_BOOST_USE_SHARED: ${ARROW_BOOST_USE_SHARED}")
12721273
if(ARROW_BOOST_USE_SHARED)
12731274
# Find shared Boost libraries.
12741275
set(Boost_USE_STATIC_LIBS OFF)
12751276
set(BUILD_SHARED_LIBS_KEEP ${BUILD_SHARED_LIBS})
12761277
set(BUILD_SHARED_LIBS ON)
1278+
message(status "-AL- ARROW_BOOST_USE_SHARED TEMP - Boost_USE_STATIC_LIBS: ${Boost_USE_STATIC_LIBS}"
1279+
)
12771280
else()
12781281
# Find static boost headers and libs
12791282
set(Boost_USE_STATIC_LIBS ON)
1283+
message(status "-AL- NOT ARROW_BOOST_USE_SHARED TEMP - Boost_USE_STATIC_LIBS: ${Boost_USE_STATIC_LIBS}"
1284+
)
12801285
endif()
12811286
if(ARROW_BOOST_REQUIRE_LIBRARY)
12821287
set(ARROW_BOOST_COMPONENTS filesystem)

0 commit comments

Comments
 (0)