aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-02-01 19:05:55 -0800
committerRobert Schumacher <roschuma@microsoft.com>2017-02-01 19:05:55 -0800
commit7a080e79163d8e3bdf9eb33b5d761d2d0ca89696 (patch)
tree72a2509140e66082283d92c5a40e4631f94e2847
parentd7ca47d9e0d8a54ada14360b0c82421272cf768a (diff)
downloadvcpkg-7a080e79163d8e3bdf9eb33b5d761d2d0ca89696.tar.gz
vcpkg-7a080e79163d8e3bdf9eb33b5d761d2d0ca89696.zip
[libvorbis] Fixup missed commit in a2f3a4b
-rw-r--r--ports/libvorbis/portfile.cmake13
1 files changed, 5 insertions, 8 deletions
diff --git a/ports/libvorbis/portfile.cmake b/ports/libvorbis/portfile.cmake
index 85fa1d26b..757196caf 100644
--- a/ports/libvorbis/portfile.cmake
+++ b/ports/libvorbis/portfile.cmake
@@ -33,15 +33,12 @@ if(NOT EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")
WORKING_DIRECTORY ${DOWNLOADS}/vorbis.git
LOGNAME worktree
)
- message(STATUS "Patching")
- vcpkg_execute_required_process(
- COMMAND ${GIT} apply ${CMAKE_CURRENT_LIST_DIR}/0001-Add-vorbisenc.c-to-vorbis-library.patch
- ${CMAKE_CURRENT_LIST_DIR}/0002-Allow-deprecated-functions.patch
- --ignore-whitespace --whitespace=fix
- WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src
- LOGNAME patch
- )
endif()
+vcpkg_apply_patches(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src
+ PATCHES
+ ${CMAKE_CURRENT_LIST_DIR}/0001-Add-vorbisenc.c-to-vorbis-library.patch
+ ${CMAKE_CURRENT_LIST_DIR}/0002-Allow-deprecated-functions.patch
+)
file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/include" OGG_INCLUDE)
file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/lib/ogg.lib" OGG_LIB_REL)