diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2020-09-09 20:27:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 12:27:33 -0700 |
| commit | c4e3da7c5f2fa1e3b477877cbf56418dbf35afc0 (patch) | |
| tree | f2f1f65c0e8f2cb348921d7d6cf199fedc144c71 | |
| parent | 8fdd0b721721753f439bba793c8c2128b028b8e3 (diff) | |
| download | vcpkg-c4e3da7c5f2fa1e3b477877cbf56418dbf35afc0.tar.gz vcpkg-c4e3da7c5f2fa1e3b477877cbf56418dbf35afc0.zip | |
[mp3lame] fix crt linkage (#13390)
* [mp3lame] fix crt linkage
* Update portfile.cmake
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
| -rw-r--r-- | ports/mp3lame/CONTROL | 3 | ||||
| -rw-r--r-- | ports/mp3lame/portfile.cmake | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ports/mp3lame/CONTROL b/ports/mp3lame/CONTROL index 5cf900065..8db5ca400 100644 --- a/ports/mp3lame/CONTROL +++ b/ports/mp3lame/CONTROL @@ -1,4 +1,5 @@ Source: mp3lame -Version: 3.100-3 +Version: 3.100 +Port-Version: 4 Homepage: http://lame.sourceforge.net/ Description: LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL. diff --git a/ports/mp3lame/portfile.cmake b/ports/mp3lame/portfile.cmake index 7abe9010f..92447757a 100644 --- a/ports/mp3lame/portfile.cmake +++ b/ports/mp3lame/portfile.cmake @@ -35,7 +35,7 @@ if(VCPKG_TARGET_IS_WINDOWS) foreach(vcxproj ${vcxprojs}) file(READ "${SOURCE_PATH}/vc_solution/${vcxproj}" vcxproj_con) - if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(NOT VCPKG_CRT_LINKAGE STREQUAL dynamic) string(REPLACE "DLL</RuntimeLibrary>" "</RuntimeLibrary>" vcxproj_con "${vcxproj_con}") endif() @@ -141,6 +141,6 @@ else() endif() file(COPY ${SOURCE_PATH}/include/lame.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/lame) -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/mp3lame/copyright COPYONLY) +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) configure_file(${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in ${CURRENT_PACKAGES_DIR}/share/mp3lame/mp3lame-config.cmake @ONLY) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/mp3lame) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) |