-
Notifications
You must be signed in to change notification settings - Fork 6.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[lapack-reference] Fixed lapack.lib not being found when linking using cmake under Windows #38035
Merged
JavierMatosD
merged 40 commits into
microsoft:master
from
jimwang118:fix-lapack-reference
Apr 24, 2024
Merged
Changes from 38 commits
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
d004f3d
remvoe from faillist
jimwang118 402871e
Revert "remvoe from faillist"
jimwang118 0a311c9
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 59af43b
fix lapack.lib not found
jimwang118 3377097
update version
jimwang118 2466145
fix config file
jimwang118 d96bb18
update version
jimwang118 21fdb4e
Merge branch 'master' into fix-lapack-reference
jimwang118 4bff5ef
update version
jimwang118 f2d77c2
update version
jimwang118 62e7fbc
update version
jimwang118 272f754
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 4743d8d
Merge branch 'master' into fix-lapack-reference
jimwang118 3aeecf9
modify config
jimwang118 45d3452
update version
jimwang118 4b0c875
\r
jimwang118 5669193
up
jimwang118 1fe36ee
update usage
jimwang118 6282fa3
update version
jimwang118 6e031c3
modify portfile
jimwang118 3492df2
update version
jimwang118 37653e4
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 05a3604
reset wrapper
jimwang118 d23ef08
update version
jimwang118 1a59795
add patch
jimwang118 02ab40c
update version
jimwang118 412cd13
modify LAPACK_LIBRARIES
jimwang118 4d279b9
update version
jimwang118 e4b3439
Merge branch 'master' of https://github.com/microsoft/vcpkg into fix-…
jimwang118 498e449
Merge branch 'master' of https://github.com/jimwang118/vcpkg
jimwang118 a57ec21
modify patch
jimwang118 905d4ba
update version
jimwang118 295500a
Merge branch 'fix-lapack-reference' of https://github.com/jimwang118/…
jimwang118 fa6da0f
Merge branch 'master' of https://github.com/Microsoft/vcpkg
jimwang118 74dfdb7
Merge branch 'master' of https://github.com/jimwang118/vcpkg
jimwang118 91f6edb
Merge branch 'master' into fix-lapack-reference
jimwang118 9092be4
add missing dependency
jimwang118 d9e6e39
update version
jimwang118 b8b4ea7
modify patch
jimwang118 db1118a
update version
jimwang118 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index c99d71a..7333110 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -10,6 +10,12 @@ set( | ||
${LAPACK_MAJOR_VERSION}.${LAPACK_MINOR_VERSION}.${LAPACK_PATCH_VERSION} | ||
) | ||
|
||
+if(WIN32) | ||
+ set(CMAKE_STATIC_LIBRARY_PREFIX "") | ||
+ set(CMAKE_SHARED_LIBRARY_PREFIX "lib") | ||
+ set(CMAKE_IMPORT_LIBRARY_PREFIX "") | ||
+endif() | ||
+ | ||
# Add the CMake directory for custom CMake modules | ||
set(CMAKE_MODULE_PATH "${LAPACK_SOURCE_DIR}/CMAKE" ${CMAKE_MODULE_PATH}) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
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 ocv.3rdparty.flatbuffers flatbuffers::flatbuffers) | ||
jimwang118 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
list(APPEND fw_hdrs "${CMAKE_CURRENT_LIST_DIR}/misc/tflite/schema_generated.h") | ||
list(APPEND fw_inc "${CMAKE_CURRENT_LIST_DIR}/misc/tflite") | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 39ec359..ee90ae6 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -177,10 +177,8 @@ if(Boost_FOUND) | ||
LIST(APPEND OpenMVS_DEFINITIONS -D_USE_BOOST) | ||
ADD_DEFINITIONS(${Boost_DEFINITIONS}) | ||
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) | ||
- if(NOT MSVC AND DEFINED CMAKE_TOOLCHAIN_FILE) | ||
- # work around this missing library link in vcpkg | ||
- LIST(APPEND Boost_LIBRARIES zstd) | ||
- endif() | ||
+ # work around this missing library link in vcpkg | ||
+ LIST(APPEND Boost_LIBRARIES zstd) | ||
jimwang118 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
SET(_USE_BOOST TRUE) | ||
endif() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess this breaks MINGW.