[matio][rocksdb] Fix build

6 files changed, 26 insertions, 89 deletions

diff --git a/ports/matio/CMakeLists.txt b/ports/matio/CMakeLists.txt
index 31b7e1e2b..6c21bbf53 100644
--- a/ports/matio/CMakeLists.txt
+++ b/ports/matio/CMakeLists.txt
@@ -30,9 +30,8 @@ find_package(ZLIB REQUIRED)
 target_link_libraries(libmatio PRIVATE ZLIB::ZLIB)
 target_compile_definitions(libmatio PRIVATE -DHAVE_ZLIB=1)
 
-find_package(HDF5 REQUIRED)
-target_include_directories(libmatio PRIVATE ${HDF5_INCLUDE_DIRS} )
-target_link_libraries(libmatio PRIVATE ${HDF5_C_LIBRARIES})
+find_package(hdf5 CONFIG REQUIRED)
+target_link_libraries(libmatio PRIVATE hdf5::hdf5-shared hdf5::hdf5_hl-shared)
 if(BUILD_SHARED_LIBS)
   target_compile_definitions(libmatio PRIVATE -DHAVE_HDF5=1 -DH5_BUILT_AS_DYNAMIC_LIB)
 else()
diff --git a/ports/matio/portfile.cmake b/ports/matio/portfile.cmake
index 5752e635c..ac9ca5c45 100644
--- a/ports/matio/portfile.cmake
+++ b/ports/matio/portfile.cmake
@@ -9,10 +9,9 @@ vcpkg_from_github(
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
 )
 
diff --git a/ports/rocksdb/0001-third-party.patch b/ports/rocksdb/0001-third-party.patch
deleted file mode 100644
index 0b0e3fa8c..000000000
--- a/ports/rocksdb/0001-third-party.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 533ab1b3f3f4286aa756e965e22aa88612479e01 Mon Sep 17 00:00:00 2001
-From: Robert Schumacher <roschuma@microsoft.com>
-Date: Fri, 23 Feb 2018 01:44:44 -0800
-Subject: [PATCH 1/3] third-party
-
----
- thirdparty.inc | 32 ++++++++++++++++----------------
- 1 file changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/thirdparty.inc b/thirdparty.inc
-index a364d1d..1d85d50 100644
---- a/thirdparty.inc
-+++ b/thirdparty.inc
-@@ -19,10 +19,10 @@ set (THIRDPARTY_LIBS "")         # Initialization, don't touch
- #
- # Edit these 4 lines to define paths to GFLAGS
- #
--set(GFLAGS_HOME $ENV{THIRDPARTY_HOME}/Gflags.Library)
--set(GFLAGS_INCLUDE ${GFLAGS_HOME}/inc/include)
--set(GFLAGS_LIB_DEBUG ${GFLAGS_HOME}/bin/debug/amd64/gflags.lib)
--set(GFLAGS_LIB_RELEASE ${GFLAGS_HOME}/bin/retail/amd64/gflags.lib)
-+set(GFLAGS_HOME ${CURRENT_INSTALLED_DIR})
-+set(GFLAGS_INCLUDE ${GFLAGS_HOME}/include)
-+set(GFLAGS_LIB_DEBUG ${GFLAGS_HOME}/debug/lib/gflagsd.lib)
-+set(GFLAGS_LIB_RELEASE ${GFLAGS_HOME}/lib/gflags.lib)
- 
- # ================================================== GFLAGS ==================================================
- #
-@@ -63,10 +63,10 @@ endif ()
- #
- # Edit these 4 lines to define paths to Snappy
- #
--set(SNAPPY_HOME $ENV{THIRDPARTY_HOME}/Snappy.Library)
--set(SNAPPY_INCLUDE ${SNAPPY_HOME}/inc/inc)
--set(SNAPPY_LIB_DEBUG ${SNAPPY_HOME}/bin/debug/amd64/snappy.lib)
--set(SNAPPY_LIB_RELEASE ${SNAPPY_HOME}/bin/retail/amd64/snappy.lib)
-+set(SNAPPY_HOME ${CURRENT_INSTALLED_DIR})
-+set(SNAPPY_INCLUDE ${SNAPPY_HOME}/include)
-+set(SNAPPY_LIB_DEBUG ${SNAPPY_HOME}/debug/lib/snappyd.lib)
-+set(SNAPPY_LIB_RELEASE ${SNAPPY_HOME}/lib/snappy.lib)
- 
- #
- # Don't touch these lines
-@@ -106,10 +106,10 @@ endif ()
- #
- # Edit these 4 lines to define paths to LZ4
- #
--set(LZ4_HOME $ENV{THIRDPARTY_HOME}/LZ4.Library)
--set(LZ4_INCLUDE ${LZ4_HOME}/inc/include)
--set(LZ4_LIB_DEBUG ${LZ4_HOME}/bin/debug/amd64/lz4.lib)
--set(LZ4_LIB_RELEASE ${LZ4_HOME}/bin/retail/amd64/lz4.lib)
-+set(LZ4_HOME ${CURRENT_INSTALLED_DIR})
-+set(LZ4_INCLUDE ${LZ4_HOME}/include)
-+set(LZ4_LIB_DEBUG ${LZ4_HOME}/debug/lib/lz4d.lib)
-+set(LZ4_LIB_RELEASE ${LZ4_HOME}/lib/lz4.lib)
- 
- #
- # Don't touch these lines
-@@ -149,10 +149,10 @@ endif ()
- #
- # Edit these 4 lines to define paths to ZLIB
- #
--set(ZLIB_HOME $ENV{THIRDPARTY_HOME}/ZLIB.Library)
--set(ZLIB_INCLUDE ${ZLIB_HOME}/inc/include)
--set(ZLIB_LIB_DEBUG ${ZLIB_HOME}/bin/debug/amd64/zlib.lib)
--set(ZLIB_LIB_RELEASE ${ZLIB_HOME}/bin/retail/amd64/zlib.lib)
-+set(ZLIB_HOME ${CURRENT_INSTALLED_DIR})
-+set(ZLIB_INCLUDE ${ZLIB_HOME}/include)
-+set(ZLIB_LIB_DEBUG ${ZLIB_HOME}/debug/lib/zlibd.lib)
-+set(ZLIB_LIB_RELEASE ${ZLIB_HOME}/lib/zlib.lib)
- 
- #
- # Don't touch these lines
--- 
-2.16.2.windows.1
-
diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL
index 161abe80e..cba7757d1 100644
--- a/ports/rocksdb/CONTROL
+++ b/ports/rocksdb/CONTROL
@@ -1,4 +1,4 @@
 Source: rocksdb
-Version: 5.10.4-2
+Version: 5.10.4-3
 Description: A library that provides an embeddable, persistent key-value store for fast storage
-Build-Depends: snappy, gflags, lz4, zlib
+Build-Depends: zlib
diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake
index ae60e824e..66541caa1 100644
--- a/ports/rocksdb/portfile.cmake
+++ b/ports/rocksdb/portfile.cmake
@@ -11,11 +11,13 @@ vcpkg_from_github(
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-    "${CMAKE_CURRENT_LIST_DIR}/0001-third-party.patch"
     "${CMAKE_CURRENT_LIST_DIR}/0002-disable-gtest.patch"
     "${CMAKE_CURRENT_LIST_DIR}/0003-only-build-one-flavor.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/use-find-package.patch"
 )
 
+file(REMOVE "${SOURCE_PATH}/cmake/modules/Findzlib.cmake")
+
 if(VCPKG_CRT_LINKAGE STREQUAL "static")
   set(WITH_MD_LIBRARY OFF)
 else()
@@ -29,10 +31,10 @@ vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
   OPTIONS
-  -DGFLAGS=1
-  -DSNAPPY=1
-  -DLZ4=1
-  -DZLIB=1
+  -DWITH_GFLAGS=0
+  -DWITH_SNAPPY=0
+  -DWITH_LZ4=0
+  -DWITH_ZLIB=1
   -DWITH_TESTS=OFF
   -DROCKSDB_INSTALL_ON_WINDOWS=ON
   -DFAIL_ON_WARNINGS=OFF
@@ -41,7 +43,7 @@ vcpkg_configure_cmake(
   -DCMAKE_DEBUG_POSTFIX=d
   -DROCKSDB_DISABLE_INSTALL_SHARED_LIB=${ROCKSDB_DISABLE_INSTALL_SHARED_LIB}
   -DROCKSDB_DISABLE_INSTALL_STATIC_LIB=${ROCKSDB_DISABLE_INSTALL_STATIC_LIB}
-  -DROCKSDB_VERSION=5.10.4
+  -DROCKSDB_VERSION=5.11.3
   -DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}
   -DCMAKE_DISABLE_FIND_PACKAGE_TBB=TRUE
   -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE
diff --git a/ports/rocksdb/use-find-package.patch b/ports/rocksdb/use-find-package.patch
new file mode 100644
index 000000000..1a79c2286
--- /dev/null
+++ b/ports/rocksdb/use-find-package.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index f3ac9ce..931e9f2 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -45,7 +45,7 @@ option(WITH_JEMALLOC "build with JeMalloc" OFF)

+ option(WITH_SNAPPY "build with SNAPPY" OFF)

+ option(WITH_LZ4 "build with lz4" OFF)

+ option(WITH_ZLIB "build with zlib" OFF)

+-if(MSVC)

++if(MSVC AND NOT VCPKG_TOOLCHAIN)

+   # Defaults currently different for GFLAGS.

+   #  We will address find_package work a little later

+   option(WITH_GFLAGS "build with GFlags" OFF)