Skip to content

Commit

Permalink
Minor cleanup in CMakeLists
Browse files Browse the repository at this point in the history
  • Loading branch information
zuyu committed Nov 19, 2024
1 parent 03deeaf commit 2fefa95
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
4 changes: 0 additions & 4 deletions CMake/resolve_dependency_modules/folly/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ FetchContent_Declare(
PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/folly-no-export.patch
${glog_patch})

if(ON_APPLE_M1)
# folly will wrongly assume x86_64 if this is not set
set(CMAKE_LIBRARY_ARCHITECTURE aarch64)
endif()
# Suppress all warnings
set(FOLLY_CXX_FLAGS -w)
# Enable INT128 support
Expand Down
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,6 @@ if(UNIX AND NOT APPLE)
add_link_options("-Wl,-export-dynamic")
endif()

if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" AND ${CMAKE_SYSTEM_NAME} MATCHES
"Darwin")
set(ON_APPLE_M1 True)
endif()

# Required so velox code can be used in a dynamic library
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)

Expand Down

0 comments on commit 2fefa95

Please sign in to comment.