3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[libmodplug] Patch CMakeLists.txt to fix install paths (#21381)

Browse Source 
* [libmodplug] fix paths

* Update version database
This commit is contained in:
itsmattkc 2021-11-16 16:59:59 -08:00 committed by GitHub
parent 16c865ef98
commit 711db4012d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ports/libmodplug/005-fix-install-paths.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 468f1a3..b58b11e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,7 +119,10 @@ add_library(modplug ${LIB_TYPE}
)
# install the library:
-install(TARGETS modplug DESTINATION lib)
+install(TARGETS modplug
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
# incstall the headers:
install(FILES

14
ports/libmodplug/portfile.cmake
View File

@ -14,6 +14,7 @@ vcpkg_from_github(ARCHIVE
002-detect_sinf.patch
003-use-static-cast-for-ctype.patch
004-export-pkgconfig.patch # https://github.com/Konstanty/libmodplug/pull/59
005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61
)
vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA)
@ -22,18 +23,7 @@ vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_TARGET_IS_MINGW)
set(BIN_NAME libmodplug.dll)
else()
set(BIN_NAME modplug.dll)
endif()
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/${BIN_NAME} ${CURRENT_PACKAGES_DIR}/bin/${BIN_NAME})
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/${BIN_NAME} ${CURRENT_PACKAGES_DIR}/debug/bin/${BIN_NAME})
vcpkg_copy_pdbs()
endif()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()

2
ports/libmodplug/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libmodplug",
"version-string": "0.8.9.0",
"port-version": 8,
"port-version": 9,
"description": "The ModPlug mod file playing library.",
"homepage": "https://github.com/Konstanty/libmodplug",
"supports": "!uwp"

2
versions/baseline.json
View File

@ -3646,7 +3646,7 @@
},
"libmodplug": {
"baseline": "0.8.9.0",
"port-version": 8
"port-version": 9
},
"libmorton": {
"baseline": "0.2.8",

5
versions/l-/libmodplug.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "28b465d4794e5c5545cb486da31a9a7ce208654b",
"version-string": "0.8.9.0",
"port-version": 9
},
{
"git-tree": "b6798791f0c306dcc5a5b9a445b618046dc7e097",
"version-string": "0.8.9.0",