[pugixml] fix dllexport for clang-cl (#25962)

* pugixml fix export macros for !cl

* v db
This commit is contained in:
Alexander Neumann 2022-07-25 23:58:07 +02:00 committed by GitHub
parent 38884e02f5
commit 4335dc2edf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17f67d1f7..9acaf856f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,8 +110,12 @@ if (BUILD_SHARED_LIBS)
PUBLIC
${PUGIXML_BUILD_DEFINES}
${PUGIXML_PUBLIC_DEFINITIONS}
+ )
+ if(WIN32)
+ target_compile_definitions(pugixml-shared
PRIVATE
- $<$<CXX_COMPILER_ID:MSVC>:PUGIXML_API=__declspec\(dllexport\)>)
+ PUGIXML_API=__declspec\(dllexport\))
+ endif()
target_compile_options(pugixml-shared
PRIVATE
${msvc-rt-mtd-shared}

View File

@ -4,6 +4,8 @@ vcpkg_from_github(
REF v1.12.1
SHA512 c1a80518e8d7b21f2a15b2023b77e87484f5b7581e68ff508785a60cab53d1689b5508f5a652d6f0d4fbcc91f66d59246fdfe499fd6b0e188c7914ed5919980b
HEAD_REF master
PATCHES
dllexport.patch
)
vcpkg_cmake_configure(

View File

@ -1,6 +1,7 @@
{
"name": "pugixml",
"version": "1.12.1",
"port-version": 1,
"description": "Light-weight, simple and fast XML parser for C++ with XPath support",
"homepage": "https://github.com/zeux/pugixml",
"license": "MIT",

View File

@ -5710,7 +5710,7 @@
},
"pugixml": {
"baseline": "1.12.1",
"port-version": 0
"port-version": 1
},
"pybind11": {
"baseline": "2.10.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0af6c22cb58a218893ca193a5f5d29d7d1753355",
"version": "1.12.1",
"port-version": 1
},
{
"git-tree": "ffaef9b7ddc94c06bf1293ff4f04906960f0de4c",
"version": "1.12.1",