From 5e92169aaa1390279354feb013a0ae52fbc08c78 Mon Sep 17 00:00:00 2001 From: Silvio Date: Wed, 16 Nov 2016 22:54:29 +0100 Subject: [PATCH] [libwebp] Fix debug postfix and build Add a debug postfix to libwebp, to simplify finding the debug library in CMake, consistently with most other libraries in vcpkg. Add the mux directory that was not built in the CMake-based build system. --- .../0002-add-missing-directory-to-cmake.patch | 12 ++++++++++++ ports/libwebp/portfile.cmake | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 ports/libwebp/0002-add-missing-directory-to-cmake.patch diff --git a/ports/libwebp/0002-add-missing-directory-to-cmake.patch b/ports/libwebp/0002-add-missing-directory-to-cmake.patch new file mode 100644 index 0000000000..a1d230479e --- /dev/null +++ b/ports/libwebp/0002-add-missing-directory-to-cmake.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9172f66..df46bd1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -249,6 +249,7 @@ parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/dec "${WEBP_SRCS}") + parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/demux "${WEBP_SRCS}") + parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/dsp "${WEBP_SRCS}") + parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/enc "${WEBP_SRCS}") ++parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "${WEBP_SRCS}") + parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/utils "${WEBP_SRCS}") + + # Remove the files specific to SIMD we don't user. diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index d85e4fdafd..8b4c653a9c 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -10,12 +10,14 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-add-install-to-cmake.patch + ${CMAKE_CURRENT_LIST_DIR}/0002-add-missing-directory-to-cmake.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} # dllexport support seem to be broken OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS:BOOL=ON + -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_install_cmake()