Commit 41f0898
committed
chore: fix a build error due to name conflict
FetchContent_MakeAvailable generate a <lowercaseName>_SOURCE_DIR[1],
for arrow it's arrow_SOURCE_DIR. arrow use a internal arrow_SOURCE_DIR
to set its THIRDPARTY_DIR[2].
The generated arrow_SOURCE_DIR overwrite the arrow's interal
arrow_SOURCE_DIR, causing the following build error:
CMake Error at build/_deps/arrow-src/cpp/cmake_modules/ThirdpartyToolchain.cmake:449 (file):
file STRINGS file
"/Users/zhjwpku/zhjwpku/iceberg-cpp/build/_deps/arrow-src/thirdparty/versions.txt"
cannot be read.
Fix this issue by renaming fetchcontent_declare name from Arrow
to VendoredArrow.
[1] https://cmake.org/cmake/help/latest/module/FetchContent.html#command:fetchcontent_makeavailable
[2] https://github.com/apache/arrow/blob/main/cpp/cmake_modules/ThirdpartyToolchain.cmake#L368
Signed-off-by: Junwang Zhao <[email protected]>1 parent 8aa7fd7 commit 41f0898
1 file changed
+7
-7
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
| 90 | + | |
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
| |||
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
103 | | - | |
| 103 | + | |
104 | 104 | | |
105 | | - | |
| 105 | + | |
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
110 | | - | |
111 | | - | |
| 110 | + | |
| 111 | + | |
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
118 | | - | |
119 | | - | |
| 118 | + | |
| 119 | + | |
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
| |||
0 commit comments