aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-03-07 13:30:38 -0800
committerRobert Schumacher <roschuma@microsoft.com>2017-03-07 13:30:38 -0800
commit06272de6b48447834c8821aa1b169a056a114cec (patch)
tree7d0c297884c91900dd75d98b59c091ec6ac3de54
parent459fa4b009be8b95dabf9d746397757b9192f6fe (diff)
downloadvcpkg-06272de6b48447834c8821aa1b169a056a114cec.tar.gz
vcpkg-06272de6b48447834c8821aa1b169a056a114cec.zip
[portaudio] Do not rename DLLs. Fix patchfile.
-rw-r--r--ports/portaudio/cmakelists-install.patch4
-rw-r--r--ports/portaudio/portfile.cmake2
2 files changed, 2 insertions, 4 deletions
diff --git a/ports/portaudio/cmakelists-install.patch b/ports/portaudio/cmakelists-install.patch
index 42fe505de..88c95260d 100644
--- a/ports/portaudio/cmakelists-install.patch
+++ b/ports/portaudio/cmakelists-install.patch
@@ -1,5 +1,5 @@
---- a/CMakeLists.txt 2016-10-30 02:23:04.000000000 +0100
-+++ b/CMakeLists.txt 2017-03-06 11:10:51.125636200 +0100
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -372,6 +372,8 @@
ENDIF()
SET_TARGET_PROPERTIES(portaudio PROPERTIES OUTPUT_NAME portaudio_${TARGET_POSTFIX} FOLDER "Portaudio")
diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake
index c91335465..b243d5a6d 100644
--- a/ports/portaudio/portfile.cmake
+++ b/ports/portaudio/portfile.cmake
@@ -34,9 +34,7 @@ if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
file (REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/portaudio_static_${VCPKG_TARGET_ARCHITECTURE}.lib)
file (RENAME ${CURRENT_PACKAGES_DIR}/lib/portaudio_${VCPKG_TARGET_ARCHITECTURE}.lib ${CURRENT_PACKAGES_DIR}/lib/portaudio.lib)
- file (RENAME ${CURRENT_PACKAGES_DIR}/bin/portaudio_${VCPKG_TARGET_ARCHITECTURE}.dll ${CURRENT_PACKAGES_DIR}/bin/portaudio.dll)
file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/portaudio_${VCPKG_TARGET_ARCHITECTURE}.lib ${CURRENT_PACKAGES_DIR}/debug/lib/portaudio.lib)
- file (RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/portaudio_${VCPKG_TARGET_ARCHITECTURE}.dll ${CURRENT_PACKAGES_DIR}/debug/bin/portaudio.dll)
else ()
file (RENAME ${CURRENT_PACKAGES_DIR}/lib/portaudio_static_${VCPKG_TARGET_ARCHITECTURE}.lib ${CURRENT_PACKAGES_DIR}/lib/portaudio.lib)
file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/portaudio_static_${VCPKG_TARGET_ARCHITECTURE}.lib ${CURRENT_PACKAGES_DIR}/debug/lib/portaudio.lib)