Skip to content

Commit

Permalink
[VL] Remove lz4 change in modify_velox.patch (apache#6824)
Browse files Browse the repository at this point in the history
  • Loading branch information
jinchengchenghh authored and shamirchen committed Oct 14, 2024
1 parent 04f73a7 commit e3cb64c
Showing 1 changed file with 0 additions and 37 deletions.
37 changes: 0 additions & 37 deletions ep/build-velox/src/modify_velox.patch
Original file line number Diff line number Diff line change
@@ -1,40 +1,3 @@
diff --git a/CMake/Findlz4.cmake b/CMake/Findlz4.cmake
index d49115f12..1aaa8e532 100644
--- a/CMake/Findlz4.cmake
+++ b/CMake/Findlz4.cmake
@@ -21,18 +21,19 @@ find_package_handle_standard_args(lz4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)

mark_as_advanced(LZ4_LIBRARY LZ4_INCLUDE_DIR)

-get_filename_component(liblz4_ext ${LZ4_LIBRARY} EXT)
-if(liblz4_ext STREQUAL ".a")
- set(liblz4_type STATIC)
-else()
- set(liblz4_type SHARED)
-endif()
-
if(NOT TARGET lz4::lz4)
- add_library(lz4::lz4 ${liblz4_type} IMPORTED)
- set_target_properties(lz4::lz4 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
- "${LZ4_INCLUDE_DIR}")
- set_target_properties(
- lz4::lz4 PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "C"
- IMPORTED_LOCATION "${LZ4_LIBRARIES}")
+ add_library(lz4::lz4 UNKNOWN IMPORTED)
+ set_target_properties(lz4::lz4 PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${LZ4_INCLUDE_DIR}"
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+ IMPORTED_LOCATION_RELEASE "${LZ4_LIBRARY_RELEASE}")
+ set_property(TARGET lz4::lz4 APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS RELEASE)
+
+ if(LZ4_LIBRARY_DEBUG)
+ set_property(TARGET lz4::lz4 APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS DEBUG)
+ set_property(TARGET lz4::lz4 PROPERTY
+ IMPORTED_LOCATION_DEBUG "${LZ4_LIBRARY_DEBUG}")
+ endif()
endif()
diff --git a/CMake/resolve_dependency_modules/arrow/CMakeLists.txt b/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
index 56b673e87..ef48ae9d9 100644
--- a/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
Expand Down

0 comments on commit e3cb64c

Please sign in to comment.