diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-04 11:26:46 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-04 11:26:46 -0800 |
| commit | 8b9b8fc7ccfc1ea291de3fd1c21f7ff99069ca92 (patch) | |
| tree | 7fd7146b42b5ba00287d87c716a84bc352236daf | |
| parent | d0d196488c708aad600d6fbef86fd9af03e53f9b (diff) | |
| download | vcpkg-8b9b8fc7ccfc1ea291de3fd1c21f7ff99069ca92.tar.gz vcpkg-8b9b8fc7ccfc1ea291de3fd1c21f7ff99069ca92.zip | |
Add namespace for tinyxml2 in tinyexif port
| -rw-r--r-- | ports/tinyexif/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tinyexif/namespace_tinyxml2.patch | 31 | ||||
| -rw-r--r-- | ports/tinyexif/portfile.cmake | 2 |
3 files changed, 34 insertions, 1 deletions
diff --git a/ports/tinyexif/CONTROL b/ports/tinyexif/CONTROL index 9c984a507..ce7162ae9 100644 --- a/ports/tinyexif/CONTROL +++ b/ports/tinyexif/CONTROL @@ -1,4 +1,4 @@ Source: tinyexif -Version: 1.0.1-1 +Version: 1.0.1-2 Build-Depends: tinyxml2 Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images diff --git a/ports/tinyexif/namespace_tinyxml2.patch b/ports/tinyexif/namespace_tinyxml2.patch new file mode 100644 index 000000000..d27c99c68 --- /dev/null +++ b/ports/tinyexif/namespace_tinyxml2.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f22584b..1ba8329 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,7 +84,7 @@ if(BUILD_SHARED_LIBS) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") # needs to have dll-interface + endif() + +- target_link_libraries(TinyEXIF tinyxml2) ++ target_link_libraries(TinyEXIF tinyxml2::tinyxml2) + set_target_properties(TinyEXIF PROPERTIES + COMPILE_DEFINITIONS "TINYEXIF_EXPORT" + VERSION "${GENERIC_LIB_VERSION}" +@@ -121,7 +121,7 @@ endif() + if(BUILD_STATIC_LIBS) + add_library(TinyEXIFstatic STATIC TinyEXIF.cpp TinyEXIF.h) + +- target_link_libraries(TinyEXIFstatic tinyxml2) ++ target_link_libraries(TinyEXIFstatic tinyxml2::tinyxml2) + set_target_properties(TinyEXIFstatic PROPERTIES + OUTPUT_NAME TinyEXIF + VERSION "${GENERIC_LIB_VERSION}" +@@ -162,7 +162,7 @@ if(BUILD_DEMO) + target_compile_definitions(TinyEXIFdemo PRIVATE TINYEXIF_IMPORT) + else(BUILD_STATIC_LIBS) + add_dependencies(TinyEXIFdemo TinyEXIFstatic) +- target_link_libraries(TinyEXIFdemo TinyEXIFstatic tinyxml2) ++ target_link_libraries(TinyEXIFdemo TinyEXIFstatic tinyxml2::tinyxml2) + endif() + endif() + diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index 4ee127d4a..716415453 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 1.0.1 SHA512 d018d882adbcebf9fa8ad67a78304a1dd21ffd3a01e3cf2d269fa34efedc5ec5f293767f3a21d62cb1bb9b88b2c364977a9125e9b88b2eac7866a8d6b27c2f23 HEAD_REF master + PATCHES + namespace_tinyxml2.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) |