3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-02 22:35:31 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4988 from FranciscoPDNeto/master

Browse Source 
[TinyXml] Linkage error fixed.
This commit is contained in:
Phil Christensen 2018-12-20 14:07:44 -08:00 committed by GitHub
commit 99b06bba5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ports/tinyxml/0002_export_tinyxml.patch Normal file
View File

@ -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;
};

8
ports/tinyxml/CMakeLists.txt
View File

@ -15,6 +15,11 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
add_library(tinyxml ${SOURCES}) add_library(tinyxml ${SOURCES})
target_compile_definitions(tinyxml PRIVATE "-DTIXML_USE_STL") target_compile_definitions(tinyxml PRIVATE "-DTIXML_USE_STL")
include(GenerateExportHeader)
generate_export_header(tinyxml)
target_include_directories(tinyxml PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
install( install(
TARGETS tinyxml TARGETS tinyxml
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
@ -22,4 +27,5 @@ install(
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
) )
install(FILES ${HEADERS} DESTINATION include) install(FILES ${HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/tinyxml_export.h DESTINATION include)

2
ports/tinyxml/CONTROL
View File

@ -1,3 +1,3 @@
Source: tinyxml Source: tinyxml
Version: 2.6.2-2 Version: 2.6.2-3
Description: A simple, small, minimal, C++ XML parser that can be easily integrating into other programs. Description: A simple, small, minimal, C++ XML parser that can be easily integrating into other programs.

18
ports/tinyxml/portfile.cmake
View File

@ -1,22 +1,22 @@
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tinyxml)
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "https://sourceforge.net/projects/tinyxml/files/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz" URLS "https://sourceforge.net/projects/tinyxml/files/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz"
FILENAME "tinyxml_2_6_2.tar.gz" FILENAME "tinyxml_2_6_2.tar.gz"
SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56 SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
) )
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF 2.6.2
PATCHES
0001_use_stl.patch
0002_export_tinyxml.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001_use_stl.patch
)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA