Skip to content

Commit

Permalink
Fix variable name
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Jan 20, 2025
1 parent 7acc372 commit f0dcc60
Showing 1 changed file with 20 additions and 10 deletions.
30 changes: 20 additions & 10 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1028,19 +1028,31 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.28)
endif()

macro(prepare_fetchcontent)
set(BUILD_SHARED_LIBS OFF)
set(BUILD_STATIC_LIBS ON)
set(CMAKE_COMPILE_WARNING_AS_ERROR FALSE)
set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
set(CMAKE_MACOSX_RPATH ${ARROW_INSTALL_NAME_RPATH})
set(BUILD_SHARED_LIBS
OFF
CACHE BOOL "" FORCE)
set(BUILD_STATIC_LIBS
ON
CACHE BOOL "" FORCE)
set(BUILD_TESTING
OFF
CACHE BOOL "" FORCE)
set(CMAKE_COMPILE_WARNING_AS_ERROR
FALSE
CACHE BOOL "" FORCE)
set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY
TRUE
CACHE BOOL "" FORCE)
set(CMAKE_MACOSX_RPATH
${ARROW_INSTALL_NAME_RPATH}
CACHE STRING "" FORCE)
if(MSVC)
string(REPLACE "/WX" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
string(REPLACE "/WX" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
else()
string(APPEND CMAKE_C_FLAGS_DEBUG " -Wno-error")
string(APPEND CMAKE_CXX_FLAGS_DEBUG " -Wno-error")
endif()
set(ENABLE_TESTING OFF)
endmacro()

# ----------------------------------------------------------------------
Expand Down Expand Up @@ -5029,12 +5041,10 @@ function(build_awssdk)
message(STATUS "Building AWS SDK for C++ from source")

set(AWSSDK_PRODUCTS aws-c-common aws-checksums)
# aws-lc and s2n-tls only needed on Linux.
# s2n-tls only needed on Linux.
# We can use LINUX with CMake 3.25 or later.
if(UNIX AND NOT APPLE)
list(APPEND AWSSDK_PRODUCTS
# aws-lc
s2n-tls)
list(APPEND AWSSDK_PRODUCTS s2n-tls)
endif()
list(APPEND
AWSSDK_PRODUCTS
Expand Down

0 comments on commit f0dcc60

Please sign in to comment.