From d93204bfe6890989373dd5d4b93977914545b35d Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Mon, 9 Dec 2024 11:47:22 -0600 Subject: [PATCH] revert rocksdb --- cmake/libraries/rocksdb.cmake | 12 +++--------- scripts/copy_mingw64_deps.sh | 4 ---- scripts/setup_msys2.sh | 6 ------ 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/cmake/libraries/rocksdb.cmake b/cmake/libraries/rocksdb.cmake index 411317d5..091d48c6 100644 --- a/cmake/libraries/rocksdb.cmake +++ b/cmake/libraries/rocksdb.cmake @@ -1,15 +1,9 @@ if(PROJECT_ENABLE_ROCKSDB) if(PROJECT_BUILD) add_definitions(-DPROJECT_ENABLE_ROCKSDB) - if (PROJECT_IS_MINGW AND NOT PROJECT_IS_MINGW_UNIX) - pkg_check_modules(ROCKSDB REQUIRED rocksdb) - include_directories(SYSTEM BEFORE ${ROCKSDB_INCLUDE_DIRS}) - link_libraries(${ROCKSDB_LIBRARIES}) - else() - find_library(ROCKSDB_LIBRARY NAMES librocksdb.a REQUIRED) - link_libraries(${ROCKSDB_LIBRARY}) - endif() - elseif(NOT PROJECT_IS_MINGW OR PROJECT_IS_MINGW_UNIX) + find_library(ROCKSDB_LIBRARY NAMES librocksdb.a REQUIRED) + link_libraries(${ROCKSDB_LIBRARY}) + elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32) ExternalProject_Add(rocksdb_project PREFIX external URL ${PROJECT_3RD_PARTY_DIR}/rocksdb-${ROCKSDB_VERSION}.tar.gz diff --git a/scripts/copy_mingw64_deps.sh b/scripts/copy_mingw64_deps.sh index dbc0a688..b8bb2319 100755 --- a/scripts/copy_mingw64_deps.sh +++ b/scripts/copy_mingw64_deps.sh @@ -108,10 +108,6 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; th PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/libpugi*.dll) fi - if [ "${PROJECT_ENABLE_ROCKSDB}" == "ON" ]; then - PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/librocksdb*.dll) - fi - if [ "${PROJECT_ENABLE_SDL}" == "ON" ]; then PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/SDL2*.dll) fi diff --git a/scripts/setup_msys2.sh b/scripts/setup_msys2.sh index bdb9fee2..7a91c90d 100755 --- a/scripts/setup_msys2.sh +++ b/scripts/setup_msys2.sh @@ -145,12 +145,6 @@ if [ "${PROJECT_ENABLE_PUGIXML}" == "ON" ]; then ) fi -if [ "${PROJECT_ENABLE_ROCKSDB}" == "ON" ]; then - PROJECT_MSYS2_PACKAGE_LIST+=( - mingw64/mingw-w64-x86_64-rocksdb - ) -fi - if [ "${PROJECT_ENABLE_SDL}" == "ON" ]; then PROJECT_MSYS2_PACKAGE_LIST+=( mingw64/mingw-w64-x86_64-SDL2