mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
6d2c971458
Fixes https://github.com/microsoft/vcpkg/issues/38009 Remove the statement renaming liblapack.lib. - [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] ~~SHA512s are updated for each updated download.~~ - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [ ] ~~Any patches that are no longer applied are deleted from the port's directory.~~ - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file. Usage test pass with following triplets: ``` x64-windows ``` --------- Co-authored-by: Jim wang (BEYONDSOFT CONSULTING INC) <v-wangjim@microsoft.com>
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 5b6e382..29a81f0 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -756,7 +756,7 @@ include(cmake/OpenCVFindLibsVideo.cmake)
|
|
include(cmake/OpenCVFindLibsPerf.cmake)
|
|
include(cmake/OpenCVFindLAPACK.cmake)
|
|
include(cmake/OpenCVFindProtobuf.cmake)
|
|
-include(cmake/OpenCVDetectFlatbuffers.cmake)
|
|
+find_package(flatbuffers CONFIG REQUIRED)
|
|
if(WITH_TENGINE)
|
|
include(cmake/OpenCVFindTengine.cmake)
|
|
endif()
|
|
diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
|
|
index 804b78e..86d9d45 100644
|
|
--- a/modules/dnn/CMakeLists.txt
|
|
+++ b/modules/dnn/CMakeLists.txt
|
|
@@ -133,7 +133,7 @@ if(TARGET ocv.3rdparty.flatbuffers AND OPENCV_DNN_TFLITE)
|
|
if(NOT HAVE_FLATBUFFERS)
|
|
message(FATAL_ERROR "DNN: TFLite is not supported without enabled 'flatbuffers'. Check build configuration.")
|
|
endif()
|
|
- list(APPEND libs ocv.3rdparty.flatbuffers)
|
|
+ list(APPEND libs flatbuffers::flatbuffers)
|
|
list(APPEND fw_hdrs "${CMAKE_CURRENT_LIST_DIR}/misc/tflite/schema_generated.h")
|
|
list(APPEND fw_inc "${CMAKE_CURRENT_LIST_DIR}/misc/tflite")
|
|
|