Skip to content

Commit 9f73303

Browse files
authored
Merge pull request #1594 from DanShaders/crc32-cmake
Set CMAKE_POLICY_VERSION_MINIMUM to 3.10 for crc32
2 parents 751ce0e + c69315f commit 9f73303

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

CMakeLists.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,15 @@ set(CRC32C_BUILD_BENCHMARKS OFF CACHE BOOL "Build CRC32C's benchmarks")
8787
set(CRC32C_USE_GLOG OFF CACHE BOOL "Build CRC32C's tests with Google Logging")
8888
set(CRC32C_INSTALL OFF CACHE BOOL "Install CRC32C's header and library")
8989
message("Add crc32c")
90-
if (NOT MSVC)
91-
set(OLD_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
92-
# fix aarch64 build @ crc32c/src/crc32c_arm64_linux_check.h
93-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=address")
94-
add_subdirectory(third-party/crc32c EXCLUDE_FROM_ALL)
95-
set(CMAKE_CXX_FLAGS ${OLD_CMAKE_CXX_FLAGS})
96-
unset(OLD_CMAKE_CXX_FLAGS)
97-
else()
90+
function(crc32_scope)
91+
set(CMAKE_POLICY_VERSION_MINIMUM "3.10")
92+
if (NOT MSVC)
93+
# fix aarch64 build @ crc32c/src/crc32c_arm64_linux_check.h
94+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=address")
95+
endif()
9896
add_subdirectory(third-party/crc32c EXCLUDE_FROM_ALL)
99-
endif()
97+
endfunction()
98+
crc32_scope()
10099
set(CRC32C_FOUND 1)
101100

102101
if (TON_USE_ROCKSDB)

0 commit comments

Comments
 (0)