Skip to content

Commit ed7c342

Browse files
luffy-zhdongjoon-hyun
authored andcommitted
ORC-1751: [C++] fix syntax error in ThirdpartyToolchain
### What changes were proposed in this pull request? fix syntax error in ThirdpartyToolchain ### Why are the changes needed? Handle the issue discussed [here]( apache/arrow#43417) ### How was this patch tested? Test it locally ### Was this patch authored or co-authored using generative AI tooling? NO Closes #1997 from luffy-zh/branch-2.0. Authored-by: luffy-zh <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent d8a1ce6 commit ed7c342

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ add_library (orc_snappy INTERFACE)
111111
add_library (orc::snappy ALIAS orc_snappy)
112112
if (ORC_PACKAGE_KIND STREQUAL "conan")
113113
target_link_libraries(orc_snappy INTERFACE ${Snappy_LIBRARIES})
114-
elseif (ORC_PREFER_STATIC_SNAPPY AND ${SNAPPY_STATIC_LIB})
114+
elseif (ORC_PREFER_STATIC_SNAPPY AND SNAPPY_STATIC_LIB)
115115
target_link_libraries(orc_snappy INTERFACE ${SNAPPY_STATIC_LIB})
116116
else ()
117117
target_link_libraries(orc_snappy INTERFACE ${SNAPPY_LIBRARY})
@@ -169,7 +169,7 @@ add_library (orc_zlib INTERFACE)
169169
add_library (orc::zlib ALIAS orc_zlib)
170170
if (ORC_PACKAGE_KIND STREQUAL "conan")
171171
target_link_libraries (orc_zlib INTERFACE ${ZLIB_LIBRARIES})
172-
elseif (ORC_PREFER_STATIC_ZLIB AND ${ZLIB_STATIC_LIB})
172+
elseif (ORC_PREFER_STATIC_ZLIB AND ZLIB_STATIC_LIB)
173173
target_link_libraries (orc_zlib INTERFACE ${ZLIB_STATIC_LIB})
174174
else ()
175175
target_link_libraries (orc_zlib INTERFACE ${ZLIB_LIBRARY})
@@ -230,7 +230,7 @@ add_library (orc_zstd INTERFACE)
230230
add_library (orc::zstd ALIAS orc_zstd)
231231
if (ORC_PACKAGE_KIND STREQUAL "conan")
232232
target_link_libraries (orc_zstd INTERFACE ${zstd_LIBRARIES})
233-
elseif (ORC_PREFER_STATIC_ZSTD AND ${ZSTD_STATIC_LIB})
233+
elseif (ORC_PREFER_STATIC_ZSTD AND ZSTD_STATIC_LIB)
234234
target_link_libraries (orc_zstd INTERFACE ${ZSTD_STATIC_LIB})
235235
else ()
236236
target_link_libraries (orc_zstd INTERFACE ${ZSTD_LIBRARY})
@@ -288,7 +288,7 @@ add_library (orc_lz4 INTERFACE)
288288
add_library (orc::lz4 ALIAS orc_lz4)
289289
if (ORC_PACKAGE_KIND STREQUAL "conan")
290290
target_link_libraries (orc_lz4 INTERFACE ${lz4_LIBRARIES})
291-
elseif (ORC_PREFER_STATIC_LZ4 AND ${LZ4_STATIC_LIB})
291+
elseif (ORC_PREFER_STATIC_LZ4 AND LZ4_STATIC_LIB)
292292
target_link_libraries (orc_lz4 INTERFACE ${LZ4_STATIC_LIB})
293293
else ()
294294
target_link_libraries (orc_lz4 INTERFACE ${LZ4_LIBRARY})
@@ -389,7 +389,7 @@ if (BUILD_CPP_TESTS)
389389
add_library (orc::gmock ALIAS orc_gmock)
390390
add_library (orc_gtest INTERFACE)
391391
add_library (orc::gtest ALIAS orc_gtest)
392-
if (ORC_PREFER_STATIC_GMOCK AND ${GMOCK_STATIC_LIB})
392+
if (ORC_PREFER_STATIC_GMOCK AND GMOCK_STATIC_LIB)
393393
target_link_libraries (orc_gmock INTERFACE ${GMOCK_STATIC_LIB})
394394
target_link_libraries (orc_gtest INTERFACE ${GTEST_STATIC_LIB})
395395
else ()
@@ -464,7 +464,7 @@ add_library (orc::protoc ALIAS orc_protoc)
464464

465465
if (ORC_PACKAGE_KIND STREQUAL "conan")
466466
target_link_libraries (orc_protobuf INTERFACE ${protobuf_LIBRARIES})
467-
elseif (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOBUF_STATIC_LIB})
467+
elseif (ORC_PREFER_STATIC_PROTOBUF AND PROTOBUF_STATIC_LIB)
468468
target_link_libraries (orc_protobuf INTERFACE ${PROTOBUF_STATIC_LIB})
469469
else ()
470470
target_link_libraries (orc_protobuf INTERFACE ${PROTOBUF_LIBRARY})
@@ -476,7 +476,7 @@ else ()
476476
endif ()
477477

478478
if (NOT ORC_PACKAGE_KIND STREQUAL "conan")
479-
if (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOC_STATIC_LIB})
479+
if (ORC_PREFER_STATIC_PROTOBUF AND PROTOC_STATIC_LIB)
480480
target_link_libraries (orc_protoc INTERFACE ${PROTOC_STATIC_LIB})
481481
else ()
482482
target_link_libraries (orc_protoc INTERFACE ${PROTOC_LIBRARY})

0 commit comments

Comments
 (0)