diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2021-03-20 00:50:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 09:50:21 -0700 |
| commit | f2b24a878462e801d7a339f67377fe7bf3826873 (patch) | |
| tree | 9fef099ef06466b06d7eac18683af92b1ff31c23 | |
| parent | 786d06e57931c459c444b5c86cd7cd87a1e19778 (diff) | |
| download | vcpkg-f2b24a878462e801d7a339f67377fe7bf3826873.tar.gz vcpkg-f2b24a878462e801d7a339f67377fe7bf3826873.zip | |
[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>
| -rw-r--r-- | ports/collada-dom/CONTROL | 4 | ||||
| -rw-r--r-- | ports/collada-dom/fix-shared-keyword.patch | 13 | ||||
| -rw-r--r-- | ports/collada-dom/portfile.cmake | 7 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/c-/collada-dom.json | 5 |
6 files changed, 26 insertions, 9 deletions
diff --git a/ports/collada-dom/CONTROL b/ports/collada-dom/CONTROL index cd5bccec5..9b6136153 100644 --- a/ports/collada-dom/CONTROL +++ b/ports/collada-dom/CONTROL @@ -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
diff --git a/ports/collada-dom/fix-shared-keyword.patch b/ports/collada-dom/fix-shared-keyword.patch new file mode 100644 index 000000000..1066622ad --- /dev/null +++ b/ports/collada-dom/fix-shared-keyword.patch @@ -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}"
diff --git a/ports/collada-dom/portfile.cmake b/ports/collada-dom/portfile.cmake index 689864cf0..84c236dab 100644 --- a/ports/collada-dom/portfile.cmake +++ b/ports/collada-dom/portfile.cmake @@ -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)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 47cd4759d..81ef00bf5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -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 diff --git a/versions/baseline.json b/versions/baseline.json index 94d1c2c6a..906fe9231 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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", diff --git a/versions/c-/collada-dom.json b/versions/c-/collada-dom.json index 115025518..456d74cea 100644 --- a/versions/c-/collada-dom.json +++ b/versions/c-/collada-dom.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "f4daab646db5e1ac2332133fd45ef8dc98b0a017", + "version-string": "2.5.0", + "port-version": 4 + }, + { "git-tree": "f53be121329578c16d057a2019a9ced1bbb24457", "version-string": "2.5.0-3", "port-version": 0 |