Skip to content

Commit 673dbeb

Browse files
Yuhong Guowesm
authored andcommitted
Try to fix ci FAILURE
1 parent 69c1e79 commit 673dbeb

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,9 +1280,10 @@ if (ARROW_USE_GLOG)
12801280
set(GLOG_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/glog_ep-prefix/src/glog_ep")
12811281
set(GLOG_INCLUDE_DIR "${GLOG_BUILD_DIR}/include")
12821282
set(GLOG_STATIC_LIB "${GLOG_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}glog${CMAKE_STATIC_LIBRARY_SUFFIX}")
1283-
set(GLOG_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} -fPIC")
1283+
set(GLOG_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
12841284
set(GLOG_CMAKE_C_FLAGS "${EP_C_FLAGS} -fPIC")
12851285
message(STATUS "GLOG_CMAKE_CXX_FLAGS: ${GLOG_CMAKE_CXX_FLAGS}")
1286+
message(STATUS "CMAKE_CXX_FLAGS in glog: ${GLOG_CMAKE_CXX_FLAGS}")
12861287

12871288
if(APPLE)
12881289
# If we don't set this flag, the binary built with 10.13 cannot be used in 10.12.
@@ -1294,9 +1295,9 @@ if (ARROW_USE_GLOG)
12941295
-DBUILD_SHARED_LIBS=OFF
12951296
-DBUILD_TESTING=OFF
12961297
-DWITH_GFLAGS=OFF
1297-
-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${GLOG_CMAKE_CXX_FLAGS}
1298-
-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${GLOG_CMAKE_C_FLAGS}
1299-
-DCMAKE_CXX_FLAGS=${GLOG_CMAKE_CXX_FLAGS})
1298+
-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${CMAKE_CXX_FLAGS}
1299+
-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${CMAKE_C_FLAGS}
1300+
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS})
13001301
message(STATUS "Glog version: ${GLOG_VERSION}")
13011302
ExternalProject_Add(glog_ep
13021303
URL ${GLOG_SOURCE_URL}

python/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,10 @@ if (PYARROW_BUILD_PLASMA)
461461
message(FATAL_ERROR "Unable to locate Plasma libraries")
462462
endif()
463463

464+
find_library(PTHREAD_LIBRARY pthread)
465+
#find_package(GLOG REQUIRED)
466+
set(LINK_LIBS ${LINK_LIBS} ${PTHREAD_LIBRARY})
467+
464468
include_directories(SYSTEM ${PLASMA_INCLUDE_DIR})
465469
ADD_THIRDPARTY_LIB(libplasma
466470
SHARED_LIB ${PLASMA_SHARED_LIB})

0 commit comments

Comments
 (0)