mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 20:21:37 +08:00
eb044d1eb5
* [OpenCV] bump to 4.5.1 and to 3.4.13 * [OpenCV] fix patches * [OpenCV] fix hdf5 integration * [OpenCV] devendor quirc * fix quirc for downstream ports * [quirc] fix target export * update version refs * [OpenMVG] fix regressions with new opencv * update version refs * fix quirc mismatch * update version refs
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
diff --git a/modules/hdf/CMakeLists.txt b/modules/hdf/CMakeLists.txt
|
|
index 2a1ae68..e40a192 100644
|
|
--- a/modules/hdf/CMakeLists.txt
|
|
+++ b/modules/hdf/CMakeLists.txt
|
|
@@ -1,25 +1,8 @@
|
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
|
-if(WIN32)
|
|
- # windows cmake internal lookups are broken for now
|
|
- # will lookup for headers and shared libs given HDF_DIR env
|
|
- find_path(HDF5_INCLUDE_DIRS hdf5.h HINTS "$ENV{HDF5_DIR}\\..\\include")
|
|
- find_library(HDF5_C_LIBRARY NAMES hdf5 HINTS "$ENV{HDF5_DIR}\\..\\lib")
|
|
- if(HDF5_INCLUDE_DIRS AND HDF5_C_LIBRARY)
|
|
- set(HDF5_FOUND "YES")
|
|
- set(HDF5_LIBRARIES ${HDF5_C_LIBRARY})
|
|
- mark_as_advanced(HDF5_LIBRARIES)
|
|
- mark_as_advanced(HDF5_C_LIBRARY)
|
|
- mark_as_advanced(HDF5_INCLUDE_DIRS)
|
|
- add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB -D_HDF5USEDLL_)
|
|
- else()
|
|
- set(HDF5_FOUND "NO")
|
|
- endif()
|
|
-else()
|
|
if(NOT CMAKE_CROSSCOMPILING) # iOS build should not reuse OSX package
|
|
find_package(HDF5)
|
|
endif()
|
|
-endif()
|
|
|
|
if(NOT HDF5_FOUND)
|
|
ocv_module_disable(hdf) # no return
|