From 6de8f92c3b61c97b2ce76e960fa55831ee455465 Mon Sep 17 00:00:00 2001 From: Canming Huang Date: Sun, 1 Nov 2020 16:58:30 -0500 Subject: [PATCH] Build hdf from source on windows. --- .gitmodules | 3 +++ hdf5 | 1 + platforms/windows/Build_Binary_x86.bat | 8 ++++++++ 3 files changed, 12 insertions(+) create mode 160000 hdf5 diff --git a/.gitmodules b/.gitmodules index dc78d750fb..64fe3e0e21 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "eigen"] path = eigen url = https://gitlab.com/libeigen/eigen.git +[submodule "hdf5"] + path = hdf5 + url = https://github.com/HDFGroup/hdf5.git diff --git a/hdf5 b/hdf5 new file mode 160000 index 0000000000..3c42c49a02 --- /dev/null +++ b/hdf5 @@ -0,0 +1 @@ +Subproject commit 3c42c49a02227a4d43504d9da7cf3df5b34f98ee diff --git a/platforms/windows/Build_Binary_x86.bat b/platforms/windows/Build_Binary_x86.bat index 1f1ec17d29..a37956fb31 100644 --- a/platforms/windows/Build_Binary_x86.bat +++ b/platforms/windows/Build_Binary_x86.bat @@ -228,6 +228,14 @@ cd .. cd .. REM SET HARFBUZZ_DIR=%cd%\harfbuzz\%BUILD_FOLDER% REM SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% -DHarfbuzz_DIR:STRING=%HARFBUZZ_DIR% + +cd hdf5 +IF NOT EXIST %BUILD_FOLDER% mkdir %BUILD_FOLDER% +cd %BUILD_FOLDER% +%CMAKE% -G %CMAKE_CONF% %GENERAL_CMAKE_CONFIG_FLAGS% -DCMAKE_INSTALL_PREFIX:STRING="%INSTALL_FOLDER:\=/%" -DCMAKE_FIND_ROOT_PATH:STRING=%INSTALL_FOLDER:\=/% .. +%CMAKE% --build . --config Release --parallel --target install +cd .. +cd .. cd %BUILD_FOLDER% SET OPENCV_EXTRA_MODULES_DIR=%cd%\..\opencv_contrib\modules