Skip to content

Commit 3903125

Browse files
committed
kou feedback
1 parent f5cebe7 commit 3903125

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

cpp/src/arrow/util/meson.build

+11-12
Original file line numberDiff line numberDiff line change
@@ -199,18 +199,6 @@ install_headers(
199199
subdir: 'arrow/util',
200200
)
201201

202-
if host_machine.system() == 'windows'
203-
# This manifest enables long file paths on Windows 10+
204-
# See https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#enable-long-paths-in-windows-10-version-1607-and-later
205-
if cpp_compiler.get_id() == 'msvc'
206-
io_util_test_sources = ['io_util_test.cc', 'io_util_test.manifest']
207-
else
208-
io_util_test_sources = ['io_util_test.cc', 'io_util_test.rc']
209-
endif
210-
else
211-
io_util_test_sources = ['io_util_test.cc']
212-
endif
213-
214202
utility_test_srcs = [
215203
'align_util_test.cc',
216204
'atfork_test.cc',
@@ -226,6 +214,7 @@ utility_test_srcs = [
226214
'key_value_metadata_test.cc',
227215
'hashing_test.cc',
228216
'int_util_test.cc',
217+
'io_util_test.cc',
229218
'iterator_test.cc',
230219
'list_util_test.cc',
231220
'logger_test.cc',
@@ -250,6 +239,16 @@ utility_test_srcs = [
250239
'value_parsing_test.cc',
251240
]
252241

242+
if host_machine.system() == 'windows'
243+
# This manifest enables long file paths on Windows 10+
244+
# See https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#enable-long-paths-in-windows-10-version-1607-and-later
245+
if cpp_compiler.get_id() == 'msvc'
246+
utility_test_sources += ['io_util_test.manifest']
247+
else
248+
utility_test_sources += ['io_util_test.rc']
249+
endif
250+
endif
251+
253252
exc = executable(
254253
'arrow-utility-test',
255254
sources: utility_test_srcs + io_util_test_sources,

0 commit comments

Comments
 (0)