Skip to content

Commit 06cce26

Browse files
committed
fix zlib
1 parent 0a1c57a commit 06cce26

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

LICENSE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,22 +408,22 @@ DEALINGS IN THE SOFTWARE.
408408

409409
--------------------------------------------------------------------------------
410410

411-
This product includes code from luceneplusplus LucenePlusPlus.
411+
This product includes code from LucenePlusPlus.
412412

413413
* LucenePlusPlus utility in src/paimon/global_index/lucene/ directory
414414

415415
Copyright: 2009-2014 Alan Wright.
416-
Home page: https://github.com/luceneplusplus/
416+
Home page: https://github.com/luceneplusplus/LucenePlusPlus
417417
License: https://www.apache.org/licenses/LICENSE-2.0
418418

419419
--------------------------------------------------------------------------------
420420

421-
This product includes code from yanyiwu cppjieba.
421+
This product includes code from cppjieba.
422422

423423
* cppjieba utility in src/paimon/global_index/lucene/ directory
424424

425425
Copyright: 2013
426-
Home page: https://github.com/yanyiwu/
426+
Home page: https://github.com/yanyiwu/cppjieba
427427
License: https://opensource.org/licenses/MIT
428428

429429
The MIT License (MIT)

cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,10 @@ set(EP_COMMON_CMAKE_ARGS
313313

314314
macro(build_lucene)
315315
message(STATUS "Building lucene from source")
316+
317+
get_target_property(LUCENE_ZLIB_INCLUDE_DIR zlib INTERFACE_INCLUDE_DIRECTORIES)
318+
get_filename_component(LUCENE_ZLIB_ROOT "${LUCENE_ZLIB_INCLUDE_DIR}" DIRECTORY)
319+
316320
set(LUCENE_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/lucene_ep-install")
317321
set(LUCENE_CMAKE_ARGS
318322
${EP_COMMON_CMAKE_ARGS}
@@ -326,6 +330,9 @@ macro(build_lucene)
326330
"-DBOOST_ROOT=${BOOST_INSTALL}"
327331
"-DBoost_CHRONO_FOUND=TRUE"
328332
"-DBoost_THREAD_FOUND=TRUE"
333+
# "-DZLIB_INCLUDE_DIRS=${ZLIB_INCLUDE_DIR}"
334+
# "-DZLIB_LIBRARY_RELEASE=${ZLIB_LIBRARIES}"
335+
"-DZLIB_ROOT=${LUCENE_ZLIB_ROOT}"
329336
"-DCMAKE_INSTALL_PREFIX=${LUCENE_PREFIX}")
330337

331338
set(LUCENE_LIB "${LUCENE_PREFIX}/lib/liblucene++.a")
@@ -335,7 +342,8 @@ macro(build_lucene)
335342
URL_HASH "SHA256=${PAIMON_LUCENE_BUILD_SHA256_CHECKSUM}"
336343
CMAKE_ARGS ${LUCENE_CMAKE_ARGS}
337344
BUILD_BYPRODUCTS ${LUCENE_LIB}
338-
DEPENDS boost_date_time
345+
DEPENDS zlib
346+
boost_date_time
339347
boost_filesystem
340348
boost_regex
341349
boost_thread
@@ -355,7 +363,8 @@ macro(build_lucene)
355363
"${LUCENE_INCLUDE_DIR}")
356364

357365
target_link_libraries(lucene
358-
INTERFACE boost_date_time
366+
INTERFACE zlib
367+
boost_date_time
359368
boost_filesystem
360369
boost_regex
361370
boost_thread

0 commit comments

Comments
 (0)