potok/TinyEXIF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tinyxml2 namespace

Browse Source
This commit is contained in:
cDc
2019-01-16 15:26:30 +02:00
parent 5bbfe8f70c
commit c57a5fec1a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -84,7 +84,7 @@ if(BUILD_SHARED_LIBS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") # needs to have dll-interface set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") # needs to have dll-interface
endif() endif()
target_link_libraries(TinyEXIF tinyxml2) target_link_libraries(TinyEXIF tinyxml2::tinyxml2)
set_target_properties(TinyEXIF PROPERTIES set_target_properties(TinyEXIF PROPERTIES
COMPILE_DEFINITIONS "TINYEXIF_EXPORT" COMPILE_DEFINITIONS "TINYEXIF_EXPORT"
VERSION "${GENERIC_LIB_VERSION}" VERSION "${GENERIC_LIB_VERSION}"
@@ -121,7 +121,7 @@ endif()
if(BUILD_STATIC_LIBS) if(BUILD_STATIC_LIBS)
add_library(TinyEXIFstatic STATIC TinyEXIF.cpp TinyEXIF.h) add_library(TinyEXIFstatic STATIC TinyEXIF.cpp TinyEXIF.h)
target_link_libraries(TinyEXIFstatic tinyxml2) target_link_libraries(TinyEXIFstatic tinyxml2::tinyxml2)
set_target_properties(TinyEXIFstatic PROPERTIES set_target_properties(TinyEXIFstatic PROPERTIES
OUTPUT_NAME TinyEXIF OUTPUT_NAME TinyEXIF
VERSION "${GENERIC_LIB_VERSION}" VERSION "${GENERIC_LIB_VERSION}"
@@ -162,7 +162,7 @@ if(BUILD_DEMO)
target_compile_definitions(TinyEXIFdemo PRIVATE TINYEXIF_IMPORT) target_compile_definitions(TinyEXIFdemo PRIVATE TINYEXIF_IMPORT)
else(BUILD_STATIC_LIBS) else(BUILD_STATIC_LIBS)
add_dependencies(TinyEXIFdemo TinyEXIFstatic) add_dependencies(TinyEXIFdemo TinyEXIFstatic)
target_link_libraries(TinyEXIFdemo TinyEXIFstatic tinyxml2) target_link_libraries(TinyEXIFdemo TinyEXIFstatic tinyxml2::tinyxml2)
endif() endif()
endif() endif()

2
TinyEXIF.cpp
View File

@@ -68,7 +68,7 @@ namespace Tools {
} }
// split an input string with a delimiter and fill a string vector // split an input string with a delimiter and fill a string vector
static void strSplit(const std::string& str, TCHAR delim, std::vector<std::string>& values) { static void strSplit(const std::string& str, char delim, std::vector<std::string>& values) {
values.clear(); values.clear();
std::string::size_type start(0), end(0); std::string::size_type start(0), end(0);
while (end != std::string::npos) { while (end != std::string::npos) {