The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add namespace for tinyxml2 in tinyexif port

Browse Source
This commit is contained in:
Phil Christensen 2018-12-04 11:26:46 -08:00
parent d0d196488c
commit 8b9b8fc7cc
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/tinyexif/CONTROL
View File

@ -1,4 +1,4 @@
Source: tinyexif Source: tinyexif
Version: 1.0.1-1 Version: 1.0.1-2
Build-Depends: tinyxml2 Build-Depends: tinyxml2
Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images

31
ports/tinyexif/namespace_tinyxml2.patch Normal file
View File

@ -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()

2
ports/tinyexif/portfile.cmake
View File

@ -6,6 +6,8 @@ vcpkg_from_github(
REF 1.0.1 REF 1.0.1
SHA512 d018d882adbcebf9fa8ad67a78304a1dd21ffd3a01e3cf2d269fa34efedc5ec5f293767f3a21d62cb1bb9b88b2c364977a9125e9b88b2eac7866a8d6b27c2f23 SHA512 d018d882adbcebf9fa8ad67a78304a1dd21ffd3a01e3cf2d269fa34efedc5ec5f293767f3a21d62cb1bb9b88b2c364977a9125e9b88b2eac7866a8d6b27c2f23
HEAD_REF master HEAD_REF master
PATCHES
namespace_tinyxml2.patch
) )
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)