diff --git a/scripts/build_dlls_windows.bat b/scripts/build_dlls_windows.bat index 326610c..4cf5f0d 100755 --- a/scripts/build_dlls_windows.bat +++ b/scripts/build_dlls_windows.bat @@ -11,7 +11,4 @@ CALL .\vendor\vcpkg\bootstrap-vcpkg.bat -disableMetrics .\vendor\vcpkg\vcpkg install rocksdb[lz4,zstd]:x64-windows-rocksdb --recurse --overlay-triplets=.\triplets mkdir .\build - -copy .\vendor\vcpkg\installed\x64-windows-rocksdb\bin\lz4-shared.dll .\build\liblz4.dll -copy .\vendor\vcpkg\installed\x64-windows-rocksdb\bin\zstd-shared.dll .\build\libzstd.dll copy .\vendor\vcpkg\installed\x64-windows-rocksdb\bin\rocksdb-shared.dll .\build\librocksdb.dll diff --git a/scripts/build_dlls_windows.sh b/scripts/build_dlls_windows.sh index f3a7370..447eb51 100755 --- a/scripts/build_dlls_windows.sh +++ b/scripts/build_dlls_windows.sh @@ -22,7 +22,4 @@ ${REPO_DIR}/vendor/vcpkg/bootstrap-vcpkg.sh -disableMetrics ${REPO_DIR}/vendor/vcpkg/vcpkg install rocksdb[lz4,zstd]:x64-windows-rocksdb --recurse --overlay-triplets=${REPO_DIR}/triplets mkdir -p ${REPO_DIR}/build - -cp ${REPO_DIR}/vendor/vcpkg/installed/x64-windows-rocksdb/bin/lz4-shared.dll ./build/liblz4.dll -cp ${REPO_DIR}/vendor/vcpkg/installed/x64-windows-rocksdb/bin/zstd-shared.dll ./build/libzstd.dll cp ${REPO_DIR}/vendor/vcpkg/installed/x64-windows-rocksdb/bin/rocksdb-shared.dll ./build/librocksdb.dll diff --git a/scripts/build_shared_deps_osx.sh b/scripts/build_shared_deps_osx.sh index 3c7eb7f..6f19c48 100755 --- a/scripts/build_shared_deps_osx.sh +++ b/scripts/build_shared_deps_osx.sh @@ -25,6 +25,4 @@ ${REPO_DIR}/vendor/vcpkg/vcpkg install rocksdb[lz4,zstd]:x64-osx-rocksdb --recur mkdir -p "${BUILD_DEST}" -cp "${REPO_DIR}/vendor/vcpkg/installed/x64-osx-rocksdb/lib/liblz4.dylib" "${BUILD_DEST}/" -cp "${REPO_DIR}/vendor/vcpkg/installed/x64-osx-rocksdb/lib/libzstd.dylib" "${BUILD_DEST}/" cp "${REPO_DIR}/vendor/vcpkg/installed/x64-osx-rocksdb/lib/librocksdb.dylib" "${BUILD_DEST}/" diff --git a/triplets/x64-osx-rocksdb.cmake b/triplets/x64-osx-rocksdb.cmake index ee5d34e..3fccdc2 100644 --- a/triplets/x64-osx-rocksdb.cmake +++ b/triplets/x64-osx-rocksdb.cmake @@ -3,5 +3,10 @@ set(VCPKG_BUILD_TYPE release) set(VCPKG_CMAKE_SYSTEM_NAME Darwin) set(VCPKG_OSX_ARCHITECTURES x86_64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) +if(${PORT} MATCHES "snappy|zlib|lz4|zstd") + set(VCPKG_CRT_LINKAGE static) + set(VCPKG_LIBRARY_LINKAGE static) +else() + set(VCPKG_CRT_LINKAGE dynamic) + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() diff --git a/triplets/x64-windows-rocksdb.cmake b/triplets/x64-windows-rocksdb.cmake index abdf9ff..5ec3033 100644 --- a/triplets/x64-windows-rocksdb.cmake +++ b/triplets/x64-windows-rocksdb.cmake @@ -1,5 +1,10 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_BUILD_TYPE release) -set(VCPKG_CRT_LINKAGE static) -set(VCPKG_LIBRARY_LINKAGE dynamic) +if(${PORT} MATCHES "snappy|zlib|lz4|zstd") + set(VCPKG_CRT_LINKAGE static) + set(VCPKG_LIBRARY_LINKAGE static) +else() + set(VCPKG_CRT_LINKAGE static) + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif()