Skip to content
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

[liborigin] fix x64-linux-dynamic #38824

Merged
merged 1 commit into from
May 27, 2024
Merged

[liborigin] fix x64-linux-dynamic #38824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 6 deletions ports/liborigin/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,8 @@ vcpkg_cmake_install()

vcpkg_fixup_pkgconfig()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
else()
file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
file(REMOVE_RECURSE ${EXES})
endif()
vcpkg_copy_tools(TOOL_NAMES opj2dat AUTO_CLEAN)

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

Expand Down
2 changes: 1 addition & 1 deletion ports/liborigin/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "liborigin",
"version": "3.0.2",
"port-version": 1,
"port-version": 2,
"description": "A library for reading OriginLab OPJ project files.",
"homepage": "https://sourceforge.net/projects/liborigin/",
"license": "GPL-2.0-or-later",
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 @@ -4774,7 +4774,7 @@
},
"liborigin": {
"baseline": "3.0.2",
"port-version": 1
"port-version": 2
},
"libosdp": {
"baseline": "3.0.5",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/liborigin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dfd4df45866d1fbcaeaf73592a12ce6564dfb6f9",
"version": "3.0.2",
"port-version": 2
},
{
"git-tree": "1af8619df06f9a9519e035cd59b7bfe89f25b59d",
"version": "3.0.2",
Expand Down