Skip to content

[check] Fix the incorrect path of dll #25211

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.

Sign up for GitHub

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

Merged
ras0219-msft merged 3 commits into from
Jun 13, 2022
Merged

[check] Fix the incorrect path of dll #25211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc1f0b5
[check] Fix the incorrect path of dll
Jun 13, 2022
e86a152
update license
Jun 13, 2022
69ebb87
x-add-version
Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ports/check/fix-lib-path.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,15 @@ index 38cbc53..d8a4272 100644
# vim: shiftwidth=2:softtabstop=2:tabstop=2:expandtab:autoindent

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4a02dbe..ade4cfd 100644
index 4a02dbe..3bf2fa6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -191,8 +191,8 @@ if(NOT THIS_IS_SUBPROJECT)
@@ -191,7 +191,7 @@ if(NOT THIS_IS_SUBPROJECT)
install(TARGETS check checkShared
EXPORT check-targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/manual-link
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
endif()
4 changes: 2 additions & 2 deletions ports/check/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "check",
"version": "0.15.2",
"port-version": 3,
"port-version": 4,
"description": "A unit testing framework for C",
"homepage": "https://github.com/libcheck/check",
"license": "LGPL-2.1",
"license": "LGPL-2.1-only",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1362,7 +1362,7 @@
},
"check": {
"baseline": "0.15.2",
"port-version": 3
"port-version": 4
},
"chipmunk": {
"baseline": "7.0.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/check.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d3b96c10d08746796f0e7540f9cb896b263cd4a9",
"version": "0.15.2",
"port-version": 4
},
{
"git-tree": "f9804577939493b7f7934d98adc953624e0020c4",
"version": "0.15.2",
Expand Down