3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

[collada-dom] Add REMOVE_RECURSE to solve DLLs error path (#16763)

Browse Source 
* 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:
JonLiu1993 2021-03-20 00:50:21 +08:00 committed by GitHub
parent 786d06e579
commit f2b24a8784
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/collada-dom/CONTROL
View File

@ -1,4 +1,6 @@
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.
Build-Depends: zlib, libxml2, minizip, pcre, uriparser, boost-filesystem, boost-system

13
ports/collada-dom/fix-shared-keyword.patch Normal file
View 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}"

7
ports/collada-dom/portfile.cmake
View File

@ -7,7 +7,8 @@ vcpkg_from_github(
PATCHES
vs-version-detection.patch
use-uriparser.patch
use-vcpkg-minizip.patch
use-vcpkg-minizip.patch
fix-shared-keyword.patch
)
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)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/licenses/license_e.txt DESTINATION
${CURRENT_PACKAGES_DIR}/share/collada-dom
RENAME copyright)
file(INSTALL ${SOURCE_PATH}/licenses/license_e.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
scripts/ci.baseline.txt
View File

@ -137,8 +137,6 @@ cmcstl2:x86-windows = skip
coin:arm64-windows=fail
coin:arm-uwp=fail
coin:x64-uwp=fail
collada-dom:x64-windows-static=fail
collada-dom:x64-windows-static-md=fail
constexpr-contracts:x64-linux=fail
coolprop:arm-uwp=fail
coolprop:x64-linux=fail

4
versions/baseline.json
View File

@ -1289,8 +1289,8 @@
"port-version": 0
},
"collada-dom": {
"baseline": "2.5.0-3",
"port-version": 0
"baseline": "2.5.0",
"port-version": 4
},
"colmap": {
"baseline": "3.6",

5
versions/c-/collada-dom.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f4daab646db5e1ac2332133fd45ef8dc98b0a017",
"version-string": "2.5.0",
"port-version": 4
},
{
"git-tree": "f53be121329578c16d057a2019a9ced1bbb24457",
"version-string": "2.5.0-3",