diff options
| author | Francisco Dias <franciscopdneto@gmail.com> | 2018-12-17 11:13:02 -0200 |
|---|---|---|
| committer | Francisco Dias <franciscopdneto@gmail.com> | 2018-12-17 11:13:02 -0200 |
| commit | 524a1414fc395fdc60951d63f4a66683309fd630 (patch) | |
| tree | f7496042d2796909cabbccf261b26c083df01a66 /ports/tinyxml | |
| parent | e04b4ed5b5ff5c1b61e5ce3d70ac101ffe3237c4 (diff) | |
| download | vcpkg-524a1414fc395fdc60951d63f4a66683309fd630.tar.gz vcpkg-524a1414fc395fdc60951d63f4a66683309fd630.zip | |
TinyXml Linkage error fixed
Diffstat (limited to 'ports/tinyxml')
| -rw-r--r-- | ports/tinyxml/0002_export_tinyxml.patch | 26 | ||||
| -rw-r--r-- | ports/tinyxml/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/tinyxml/portfile.cmake | 1 |
3 files changed, 34 insertions, 1 deletions
diff --git a/ports/tinyxml/0002_export_tinyxml.patch b/ports/tinyxml/0002_export_tinyxml.patch new file mode 100644 index 000000000..7f09a6ec9 --- /dev/null +++ b/ports/tinyxml/0002_export_tinyxml.patch @@ -0,0 +1,26 @@ +# User Francisco Dias +# Date 1545049386 7200 +# Mon Dec 17 10:23:06 2018 -0200 +Export tinyXML. + +diff --git a/tinyxml.h b/tinyxml.h +--- a/tinyxml.h ++++ b/tinyxml.h +@@ -38,6 +38,8 @@ + #include <string.h>
+ #include <assert.h>
+
++#include "tinyxml_export.h"
++
+ // Help out windows:
+ #if defined( _DEBUG ) && !defined( DEBUG )
+ #define DEBUG
+@@ -414,7 +416,7 @@ +
+ };
+ static Entity entity[ NUM_ENTITY ];
+- static bool condenseWhiteSpace;
++ static TINYXML_EXPORT bool condenseWhiteSpace;
+ };
+
+
diff --git a/ports/tinyxml/CMakeLists.txt b/ports/tinyxml/CMakeLists.txt index 9b55aa717..21776c156 100644 --- a/ports/tinyxml/CMakeLists.txt +++ b/ports/tinyxml/CMakeLists.txt @@ -15,6 +15,11 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) add_library(tinyxml ${SOURCES}) target_compile_definitions(tinyxml PRIVATE "-DTIXML_USE_STL") +include(GenerateExportHeader) +generate_export_header(tinyxml) + +target_include_directories(tinyxml PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + install( TARGETS tinyxml ARCHIVE DESTINATION lib @@ -22,4 +27,5 @@ install( RUNTIME DESTINATION bin ) -install(FILES ${HEADERS} DESTINATION include) +install(FILES ${HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/tinyxml_export.h DESTINATION include) diff --git a/ports/tinyxml/portfile.cmake b/ports/tinyxml/portfile.cmake index 54d462bb4..dcd1fcc08 100644 --- a/ports/tinyxml/portfile.cmake +++ b/ports/tinyxml/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_use_stl.patch + ${CMAKE_CURRENT_LIST_DIR}/0002_export_tinyxml.patch ) vcpkg_configure_cmake( |