Skip to content

Commit 645e0a3

Browse files
committed
Use FC_DECLARE_COMMON_OPTIONS instead of manually setting variables for RE2
1 parent e60761d commit 645e0a3

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2854,23 +2854,16 @@ function(build_re2)
28542854
PARENT_SCOPE)
28552855

28562856
fetchcontent_declare(re2
2857+
${FC_DECLARE_COMMON_OPTIONS}
28572858
URL ${RE2_SOURCE_URL}
2858-
URL_HASH "SHA256=${ARROW_RE2_BUILD_SHA256_CHECKSUM}"
2859-
EXCLUDE_FROM_ALL)
2859+
URL_HASH "SHA256=${ARROW_RE2_BUILD_SHA256_CHECKSUM}")
28602860
prepare_fetchcontent()
28612861

28622862
# Unity build causes some build errors
28632863
set(CMAKE_UNITY_BUILD OFF)
28642864

2865-
# Disable install rules for RE2 so it is not installed on our Linux-packages.
2866-
set(CMAKE_SKIP_INSTALL_RULES ON)
2867-
28682865
fetchcontent_makeavailable(re2)
28692866

2870-
# We have to create an empty cmake_install.cmake so include() doesn't fail but doesn't install anything.
2871-
file(WRITE "${re2_BINARY_DIR}/cmake_install.cmake"
2872-
"# RE2 install disabled via CMAKE_SKIP_INSTALL_RULES\n")
2873-
28742867
set(ARROW_BUNDLED_STATIC_LIBS
28752868
${ARROW_BUNDLED_STATIC_LIBS} re2::re2
28762869
PARENT_SCOPE)

0 commit comments

Comments
 (0)