diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2016-11-16 15:29:38 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 15:29:38 -0800 |
| commit | 9f1a3ab0aedcd2a798b930ff7277b480359aa489 (patch) | |
| tree | 4d04ec8d11b891a0ccbd65a1f5a12222a6c3703d | |
| parent | 009378acceee049bef769451aa790c453a9f2a19 (diff) | |
| parent | 5e92169aaa1390279354feb013a0ae52fbc08c78 (diff) | |
| download | vcpkg-9f1a3ab0aedcd2a798b930ff7277b480359aa489.tar.gz vcpkg-9f1a3ab0aedcd2a798b930ff7277b480359aa489.zip | |
Merge pull request #298 from traversaro/fix-libwebp
[libwebp] Fix debug postfix and build
| -rw-r--r-- | ports/libwebp/0002-add-missing-directory-to-cmake.patch | 12 | ||||
| -rw-r--r-- | ports/libwebp/portfile.cmake | 2 |
2 files changed, 14 insertions, 0 deletions
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 000000000..a1d230479 --- /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 d85e4fdaf..8b4c653a9 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() |