mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-31 05:03:22 +08:00
[collada-dom] Add REMOVE_RECURSE to solve DLLs error path (#16763)
* Add REMOVE_RECURSE to solve DLLs error path * update version * delete ci.baseline default set * modify suggested change * update version * update control file * update version * update homepage * update version * Update scripts/ci.baseline.txt * fix shared keyword * update version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
This commit is contained in:
parent
786d06e579
commit
f2b24a8784
@ -1,4 +1,6 @@
|
|||||||
Source: collada-dom
|
Source: collada-dom
|
||||||
Version: 2.5.0-3
|
Version: 2.5.0
|
||||||
|
Port-Version: 4
|
||||||
|
Homepage: https://github.com/rdiankov/collada-dom
|
||||||
Description: The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.
|
Description: The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.
|
||||||
Build-Depends: zlib, libxml2, minizip, pcre, uriparser, boost-filesystem, boost-system
|
Build-Depends: zlib, libxml2, minizip, pcre, uriparser, boost-filesystem, boost-system
|
||||||
|
13
ports/collada-dom/fix-shared-keyword.patch
Normal file
13
ports/collada-dom/fix-shared-keyword.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/dom/CMakeLists.txt b/dom/CMakeLists.txt
|
||||||
|
index 62e1b8a..7ff49b5 100644
|
||||||
|
--- a/dom/CMakeLists.txt
|
||||||
|
+++ b/dom/CMakeLists.txt
|
||||||
|
@@ -28,7 +28,7 @@ if( OPT_COLLADA14 )
|
||||||
|
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/1.4 DESTINATION ${COLLADA_DOM_INCLUDE_INSTALL_DIR} COMPONENT ${COMPONENT_PREFIX}-dev PATTERN ".svn" EXCLUDE PATTERN ".~" EXCLUDE)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
-add_library(collada-dom SHARED ${COLLADA_BASE_SOURCES})
|
||||||
|
+add_library(collada-dom ${COLLADA_BASE_SOURCES})
|
||||||
|
target_link_libraries(collada-dom ${COLLADA_LIBS})
|
||||||
|
set_target_properties(collada-dom PROPERTIES
|
||||||
|
COMPILE_FLAGS "${COLLADA_COMPILE_FLAGS}"
|
@ -8,6 +8,7 @@ vcpkg_from_github(
|
|||||||
vs-version-detection.patch
|
vs-version-detection.patch
|
||||||
use-uriparser.patch
|
use-uriparser.patch
|
||||||
use-vcpkg-minizip.patch
|
use-vcpkg-minizip.patch
|
||||||
|
fix-shared-keyword.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_configure_cmake(
|
vcpkg_configure_cmake(
|
||||||
@ -22,6 +23,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/collada_dom-2.5)
|
|||||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||||
|
|
||||||
# Handle copyright
|
# Handle copyright
|
||||||
file(INSTALL ${SOURCE_PATH}/licenses/license_e.txt DESTINATION
|
file(INSTALL ${SOURCE_PATH}/licenses/license_e.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||||
${CURRENT_PACKAGES_DIR}/share/collada-dom
|
|
||||||
RENAME copyright)
|
|
||||||
|
@ -137,8 +137,6 @@ cmcstl2:x86-windows = skip
|
|||||||
coin:arm64-windows=fail
|
coin:arm64-windows=fail
|
||||||
coin:arm-uwp=fail
|
coin:arm-uwp=fail
|
||||||
coin:x64-uwp=fail
|
coin:x64-uwp=fail
|
||||||
collada-dom:x64-windows-static=fail
|
|
||||||
collada-dom:x64-windows-static-md=fail
|
|
||||||
constexpr-contracts:x64-linux=fail
|
constexpr-contracts:x64-linux=fail
|
||||||
coolprop:arm-uwp=fail
|
coolprop:arm-uwp=fail
|
||||||
coolprop:x64-linux=fail
|
coolprop:x64-linux=fail
|
||||||
|
@ -1289,8 +1289,8 @@
|
|||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"collada-dom": {
|
"collada-dom": {
|
||||||
"baseline": "2.5.0-3",
|
"baseline": "2.5.0",
|
||||||
"port-version": 0
|
"port-version": 4
|
||||||
},
|
},
|
||||||
"colmap": {
|
"colmap": {
|
||||||
"baseline": "3.6",
|
"baseline": "3.6",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "f4daab646db5e1ac2332133fd45ef8dc98b0a017",
|
||||||
|
"version-string": "2.5.0",
|
||||||
|
"port-version": 4
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "f53be121329578c16d057a2019a9ced1bbb24457",
|
"git-tree": "f53be121329578c16d057a2019a9ced1bbb24457",
|
||||||
"version-string": "2.5.0-3",
|
"version-string": "2.5.0-3",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user