diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2022-09-01 02:26:01 +0800 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2022-09-01 02:49:31 +0800 |
| commit | f6e5a565439cd90458b03781215033998cb0a133 (patch) | |
| tree | f124e3107cfcc2330281c09803671e12b6b8cddd /databases/tiledb/files/patch-magic | |
| parent | textproc/minify: Update to 2.12.1 (diff) | |
databases/tiledb: Update to 2.11.1
Changes: https://github.com/TileDB-Inc/TileDB/releases
Diffstat (limited to 'databases/tiledb/files/patch-magic')
| -rw-r--r-- | databases/tiledb/files/patch-magic | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/databases/tiledb/files/patch-magic b/databases/tiledb/files/patch-magic index a30de0666dfb..b1a0812ff549 100644 --- a/databases/tiledb/files/patch-magic +++ b/databases/tiledb/files/patch-magic @@ -1,6 +1,6 @@ Obtained from: https://github.com/TileDB-Inc/TileDB/pull/3270 ---- cmake/Modules/FindMagic_EP.cmake.orig 2022-06-24 19:24:23 UTC +--- cmake/Modules/FindMagic_EP.cmake.orig 2022-08-25 01:25:52 UTC +++ cmake/Modules/FindMagic_EP.cmake @@ -3,7 +3,7 @@ # @@ -122,14 +122,13 @@ Obtained from: https://github.com/TileDB-Inc/TileDB/pull/3270 if (libmagic_FOUND AND NOT TARGET libmagic) message(STATUS "Found Magic, adding imported target: ${libmagic_LIBRARIES}") ---- tiledb/CMakeLists.txt.orig 2022-06-24 19:24:23 UTC +--- tiledb/CMakeLists.txt.orig 2022-08-25 01:25:52 UTC +++ tiledb/CMakeLists.txt -@@ -336,18 +336,22 @@ add_library(TILEDB_CORE_OBJECTS OBJECT +@@ -357,14 +357,18 @@ target_link_libraries(TILEDB_CORE_OBJECTS PRIVATE $<BU ############################################################ # provide actions/target for preparation of magic.mgc data for embedding/build --#set(MGC_GZIPPED_BIN_PATH3 "${CMAKE_CURRENT_SOURCE_DIR}/sm/misc/magic_mgc_gzipped.bin") --set(MGC_GZIPPED_BIN_OUTPUT_DIRECTORY "${TILEDB_EP_BASE}/install/include") +-set(MGC_GZIPPED_BIN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/..") +set(MGC_GZIPPED_BIN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/sm/misc") set(MGC_GZIPPED_BIN_OUTPUT_FILE "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}/magic_mgc_gzipped.bin") set(MGC_GZIPPED_BIN_INPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sm/misc") @@ -146,11 +145,7 @@ Obtained from: https://github.com/TileDB-Inc/TileDB/pull/3270 COMMAND ${CMAKE_COMMAND} -E tar x "${MGC_GZIPPED_BIN_INPUT_FILE}" WORKING_DIRECTORY "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}" ) -+ - add_custom_target(gen_mgc_unarch ALL - DEPENDS ${MGC_GZIPPED_BIN_OUTPUT_FILE} - ) -@@ -360,7 +364,7 @@ add_custom_target( +@@ -380,7 +384,7 @@ add_custom_target( WORKING_DIRECTORY "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}" COMMAND ${CMAKE_COMMAND} -E tar cvj "magic_mgc_gzipped.bin.tar.bz2" "magic_mgc_gzipped.bin" COMMAND ${CMAKE_COMMAND} -E copy "magic_mgc_gzipped.bin.tar.bz2" "${MGC_GZIPPED_BIN_INPUT_FILE}" @@ -159,7 +154,7 @@ Obtained from: https://github.com/TileDB-Inc/TileDB/pull/3270 COMMENT "Re-generate ${MGC_GZIPPED_BIN_INPUT_FILE} for embedded magic.mgc support" ) -@@ -374,6 +378,8 @@ target_include_directories(TILEDB_CORE_OBJECTS +@@ -394,6 +398,8 @@ target_include_directories(TILEDB_CORE_OBJECTS "${TILEDB_EXTERNALS_INCLUDE_DIRS}" # to pickup <build_dir>/tiledb for capnp gen'd files "${CMAKE_CURRENT_BINARY_DIR}/.." |