diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-06 16:23:29 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-06 16:23:29 -0800 |
| commit | 86bb2c8d1614548c48a8dc274890e8751b7ef8a5 (patch) | |
| tree | dcf005b3e1622f4e22fbfadd40ba905f704256f7 /ports/tinyexif/namespace_tinyxml2.patch | |
| parent | 197fbf3b8b4bf10a53f44101648b6021d2f3cf14 (diff) | |
| parent | 63c1b2628e958f8e02356411f032941c0c2f3bbb (diff) | |
| download | vcpkg-86bb2c8d1614548c48a8dc274890e8751b7ef8a5.tar.gz vcpkg-86bb2c8d1614548c48a8dc274890e8751b7ef8a5.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4903
Diffstat (limited to 'ports/tinyexif/namespace_tinyxml2.patch')
| -rw-r--r-- | ports/tinyexif/namespace_tinyxml2.patch | 31 |
1 files changed, 31 insertions, 0 deletions
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() + |