From 7738c005c195f7c1a3623e0180aee8daa7ba941b Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Thu, 18 Nov 2021 13:51:55 -0600 Subject: [PATCH 01/11] [opennurbs] add opennurbs --- ports/opennurbs/portfile.cmake | 35 ++++++++++++++++++++++++++++++++++ ports/opennurbs/usage | 4 ++++ ports/opennurbs/vcpkg.json | 16 ++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 ports/opennurbs/portfile.cmake create mode 100644 ports/opennurbs/usage create mode 100644 ports/opennurbs/vcpkg.json diff --git a/ports/opennurbs/portfile.cmake b/ports/opennurbs/portfile.cmake new file mode 100644 index 00000000000000..2cab4cdeb69203 --- /dev/null +++ b/ports/opennurbs/portfile.cmake @@ -0,0 +1,35 @@ +set(VERSION v7.11.21285.13001) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aminya/opennurbs + REF tags/${VERSION}_cmake + SHA512 8d3c9faaf5ee44bee0433ec2e5fcf0b4f1489f044d6cab85035524ffa0b265db0be7866ce746854e604af536da6c16eb577c08faa6dd4dbd51bfd94ed2283801 + HEAD_REF master +) + +# The shared library needs to be fixed +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(opennurbs_SHARED ON) +else() + set(opennurbs_SHARED OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Dopennurbs_SHARED=${OPENMESH_BUILD_SHARED} +) + +vcpkg_cmake_build(TARGET opennurbs) + +# copy header files +file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") +foreach(HEADER_FILE ${HEADER_FILES}) + file(INSTALL "${HEADER_FILE}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +endforeach() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/opennurbs/usage b/ports/opennurbs/usage new file mode 100644 index 00000000000000..427fc68e76fa4e --- /dev/null +++ b/ports/opennurbs/usage @@ -0,0 +1,4 @@ +The package opennurbs provides CMake targets: + + find_package(opennurbs REQUIRED) + target_link_libraries(main PRIVATE opennurbs::opennurbs) diff --git a/ports/opennurbs/vcpkg.json b/ports/opennurbs/vcpkg.json new file mode 100644 index 00000000000000..6547a43b7ec518 --- /dev/null +++ b/ports/opennurbs/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "opennurbs", + "version-string": "v7.11.21285.13001", + "port-version": 1, + "description": "The openNURBS Initiative provides CAD, CAM, CAE, and computer graphics software developers the tools to accurately transfer 3D geometry between applications.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From ae7bff868715bf566a6584e616bfa9cd5098d24a Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Thu, 18 Nov 2021 15:13:19 -0600 Subject: [PATCH 02/11] [opennurbs] Update ci.baseline.txt and add version --- scripts/ci.baseline.txt | 4 ++++ versions/baseline.json | 4 ++++ versions/o-/opennurbs.json | 9 +++++++++ 3 files changed, 17 insertions(+) create mode 100644 versions/o-/opennurbs.json diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4bfdb19a1f6f2c..5ec26d88598faf 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1079,6 +1079,10 @@ openmpi:x64-windows-static-md=fail openmpi:x86-windows=fail openni2:x64-uwp=fail openni2:x64-windows-static=fail +opennurbs:x64-uwp=fail +opennurbs:arm64-windows=fail +opennurbs:arm-uwp=fail +opennurbs:x64-osx=fail openscap:x64-linux=fail openscap:x64-osx=fail openssl-unix:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 08e122171290f1..61c6fef23dde2b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4972,6 +4972,10 @@ "baseline": "2.2.0.33", "port-version": 13 }, + "opennurbs": { + "baseline": "v7.11.21285.13001", + "port-version": 1 + }, "openscap": { "baseline": "1.3.1", "port-version": 1 diff --git a/versions/o-/opennurbs.json b/versions/o-/opennurbs.json new file mode 100644 index 00000000000000..bd99b47f95367f --- /dev/null +++ b/versions/o-/opennurbs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ad152df5cb60850af9dfe7cd2c7ced2a3fa2d661", + "version-string": "v7.11.21285.13001", + "port-version": 1 + } + ] +} From 7d796e0cac68b2a211b48e13fc612bb04fe8d2da Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Thu, 18 Nov 2021 16:37:39 -0600 Subject: [PATCH 03/11] [opennurbs] add support for shared libraries on windows --- ports/opennurbs/portfile.cmake | 14 ++++++++------ versions/o-/opennurbs.json | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ports/opennurbs/portfile.cmake b/ports/opennurbs/portfile.cmake index 2cab4cdeb69203..d8296a24ea862e 100644 --- a/ports/opennurbs/portfile.cmake +++ b/ports/opennurbs/portfile.cmake @@ -4,24 +4,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aminya/opennurbs REF tags/${VERSION}_cmake - SHA512 8d3c9faaf5ee44bee0433ec2e5fcf0b4f1489f044d6cab85035524ffa0b265db0be7866ce746854e604af536da6c16eb577c08faa6dd4dbd51bfd94ed2283801 + SHA512 f3f87289b05bf82374b7f7108a7689898c114f4aefa286fecb07edb47a66424155cb3fe48155a4b23c7460dc106175e5288cd2686f98cce59f8587536dbeb49e HEAD_REF master ) -# The shared library needs to be fixed -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") + # shared libraries are only supported on Windows + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(opennurbs_SHARED ON) + set(OPENNURBS_SHARED ON) else() - set(opennurbs_SHARED OFF) + set(OPENNURBS_SHARED OFF) endif() vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -Dopennurbs_SHARED=${OPENMESH_BUILD_SHARED} + -DOPENNURBS_SHARED=${OPENNURBS_SHARED} ) vcpkg_cmake_build(TARGET opennurbs) diff --git a/versions/o-/opennurbs.json b/versions/o-/opennurbs.json index bd99b47f95367f..f03b4f27e816cd 100644 --- a/versions/o-/opennurbs.json +++ b/versions/o-/opennurbs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ad152df5cb60850af9dfe7cd2c7ced2a3fa2d661", + "git-tree": "e8be4b3ef39db020331da0c0a337233a3b16aee6", "version-string": "v7.11.21285.13001", "port-version": 1 } From cc5171c120573fd77de2067ae241f31956f8af5c Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Thu, 18 Nov 2021 21:31:48 -0600 Subject: [PATCH 04/11] [opennurbs] fix macos build --- ports/opennurbs/portfile.cmake | 2 +- scripts/ci.baseline.txt | 1 - versions/o-/opennurbs.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/opennurbs/portfile.cmake b/ports/opennurbs/portfile.cmake index d8296a24ea862e..bdea998f674bea 100644 --- a/ports/opennurbs/portfile.cmake +++ b/ports/opennurbs/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aminya/opennurbs REF tags/${VERSION}_cmake - SHA512 f3f87289b05bf82374b7f7108a7689898c114f4aefa286fecb07edb47a66424155cb3fe48155a4b23c7460dc106175e5288cd2686f98cce59f8587536dbeb49e + SHA512 a8287a7f7d277062295f4e15ddbd1e7717956a77e2d874d7f24652bc08817b8181cf6bef6ff8ee9ab8586496c12594ab0aac13cbe569d2e3c6b9fa07675a58a2 HEAD_REF master ) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5ec26d88598faf..e1fbe99e56ab03 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1082,7 +1082,6 @@ openni2:x64-windows-static=fail opennurbs:x64-uwp=fail opennurbs:arm64-windows=fail opennurbs:arm-uwp=fail -opennurbs:x64-osx=fail openscap:x64-linux=fail openscap:x64-osx=fail openssl-unix:arm64-windows=fail diff --git a/versions/o-/opennurbs.json b/versions/o-/opennurbs.json index f03b4f27e816cd..2799f7b9890057 100644 --- a/versions/o-/opennurbs.json +++ b/versions/o-/opennurbs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e8be4b3ef39db020331da0c0a337233a3b16aee6", + "git-tree": "f654c772ca0656a0e78943d89e6dc31cd10332d3", "version-string": "v7.11.21285.13001", "port-version": 1 } From 745df6e857fd0cf31f44cffb09de605ba22d9b3a Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Thu, 18 Nov 2021 21:34:54 -0600 Subject: [PATCH 05/11] [opennurbs] clean-up the port and vcpkg.json Co-Authored-By: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/opennurbs/portfile.cmake | 8 ++------ ports/opennurbs/vcpkg.json | 5 ----- versions/baseline.json | 2 +- versions/o-/opennurbs.json | 5 +++++ 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ports/opennurbs/portfile.cmake b/ports/opennurbs/portfile.cmake index bdea998f674bea..f263bf46a7a65f 100644 --- a/ports/opennurbs/portfile.cmake +++ b/ports/opennurbs/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aminya/opennurbs REF tags/${VERSION}_cmake - SHA512 a8287a7f7d277062295f4e15ddbd1e7717956a77e2d874d7f24652bc08817b8181cf6bef6ff8ee9ab8586496c12594ab0aac13cbe569d2e3c6b9fa07675a58a2 + SHA512 4e3174b216fa28ef85c4a3187154a2804f9fd6af43e771191b0234f7a128f0db86c915ba23885701c4c829907f8a4753b2162ec55acc883f2f5c6fbfbfdd790e HEAD_REF master ) @@ -13,11 +13,7 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(OPENNURBS_SHARED ON) -else() - set(OPENNURBS_SHARED OFF) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPENNURBS_SHARED) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/opennurbs/vcpkg.json b/ports/opennurbs/vcpkg.json index 6547a43b7ec518..c59276b644b787 100644 --- a/ports/opennurbs/vcpkg.json +++ b/ports/opennurbs/vcpkg.json @@ -1,16 +1,11 @@ { "name": "opennurbs", "version-string": "v7.11.21285.13001", - "port-version": 1, "description": "The openNURBS Initiative provides CAD, CAM, CAE, and computer graphics software developers the tools to accurately transfer 3D geometry between applications.", "dependencies": [ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 61c6fef23dde2b..58621f18f67fb2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4974,7 +4974,7 @@ }, "opennurbs": { "baseline": "v7.11.21285.13001", - "port-version": 1 + "port-version": 0 }, "openscap": { "baseline": "1.3.1", diff --git a/versions/o-/opennurbs.json b/versions/o-/opennurbs.json index 2799f7b9890057..f4780fae908893 100644 --- a/versions/o-/opennurbs.json +++ b/versions/o-/opennurbs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3eae8364c989b27489747e57413e6e7c751250e", + "version-string": "v7.11.21285.13001", + "port-version": 0 + }, { "git-tree": "f654c772ca0656a0e78943d89e6dc31cd10332d3", "version-string": "v7.11.21285.13001", From a55534af21c4ac88ee7169e804c6fac499d1a37c Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Fri, 19 Nov 2021 00:42:56 -0600 Subject: [PATCH 06/11] [opennurbs] specify c++ standard - fix build on c++ 20 --- ports/opennurbs/portfile.cmake | 2 +- versions/o-/opennurbs.json | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ports/opennurbs/portfile.cmake b/ports/opennurbs/portfile.cmake index f263bf46a7a65f..cfe7b2cb1a6ed3 100644 --- a/ports/opennurbs/portfile.cmake +++ b/ports/opennurbs/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aminya/opennurbs REF tags/${VERSION}_cmake - SHA512 4e3174b216fa28ef85c4a3187154a2804f9fd6af43e771191b0234f7a128f0db86c915ba23885701c4c829907f8a4753b2162ec55acc883f2f5c6fbfbfdd790e + SHA512 8d3c9faaf5ee44bee0433ec2e5fcf0b4f1489f044d6cab85035524ffa0b265db0be7866ce746854e604af536da6c16eb577c08faa6dd4dbd51bfd94ed2283801 HEAD_REF master ) diff --git a/versions/o-/opennurbs.json b/versions/o-/opennurbs.json index f4780fae908893..bf5c5f328e2b13 100644 --- a/versions/o-/opennurbs.json +++ b/versions/o-/opennurbs.json @@ -1,14 +1,9 @@ { "versions": [ { - "git-tree": "e3eae8364c989b27489747e57413e6e7c751250e", + "git-tree": "2db30bf4fee1af6bb07cda0dad25dfdef128598e", "version-string": "v7.11.21285.13001", "port-version": 0 - }, - { - "git-tree": "f654c772ca0656a0e78943d89e6dc31cd10332d3", - "version-string": "v7.11.21285.13001", - "port-version": 1 } ] } From e7c779cd0471136e76327cfa4f6590cf9d3bb550 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Fri, 19 Nov 2021 14:34:49 -0600 Subject: [PATCH 07/11] [opennurbs] add dirent dependency + fix osx uuid finding --- ports/opennurbs/portfile.cmake | 2 +- ports/opennurbs/vcpkg.json | 1 + versions/o-/opennurbs.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/opennurbs/portfile.cmake b/ports/opennurbs/portfile.cmake index cfe7b2cb1a6ed3..d59f1012b8f014 100644 --- a/ports/opennurbs/portfile.cmake +++ b/ports/opennurbs/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aminya/opennurbs REF tags/${VERSION}_cmake - SHA512 8d3c9faaf5ee44bee0433ec2e5fcf0b4f1489f044d6cab85035524ffa0b265db0be7866ce746854e604af536da6c16eb577c08faa6dd4dbd51bfd94ed2283801 + SHA512 f72aa207c18ddfcfc0fe5e367f985c3b56886d076ab3683ea47c890afacdb2856b1bd46407c6215647b446f028fd0ed3b91956ce6c92d65d573194e4798d2df4 HEAD_REF master ) diff --git a/ports/opennurbs/vcpkg.json b/ports/opennurbs/vcpkg.json index c59276b644b787..11b5eb68275ffe 100644 --- a/ports/opennurbs/vcpkg.json +++ b/ports/opennurbs/vcpkg.json @@ -3,6 +3,7 @@ "version-string": "v7.11.21285.13001", "description": "The openNURBS Initiative provides CAD, CAM, CAE, and computer graphics software developers the tools to accurately transfer 3D geometry between applications.", "dependencies": [ + "dirent", { "name": "vcpkg-cmake", "host": true diff --git a/versions/o-/opennurbs.json b/versions/o-/opennurbs.json index bf5c5f328e2b13..5b264b13474c43 100644 --- a/versions/o-/opennurbs.json +++ b/versions/o-/opennurbs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2db30bf4fee1af6bb07cda0dad25dfdef128598e", + "git-tree": "52c9b6b0e8a13d924e0fc7f467d7ade8abb598f3", "version-string": "v7.11.21285.13001", "port-version": 0 } From 827f991a3ced8f5ffedf3e7cb82543f02e3dc00c Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Fri, 19 Nov 2021 15:15:28 -0600 Subject: [PATCH 08/11] [opennurbs] exclude android_uuid on macos --- ports/opennurbs/portfile.cmake | 2 +- versions/o-/opennurbs.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/opennurbs/portfile.cmake b/ports/opennurbs/portfile.cmake index d59f1012b8f014..ebda134238a5a3 100644 --- a/ports/opennurbs/portfile.cmake +++ b/ports/opennurbs/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aminya/opennurbs REF tags/${VERSION}_cmake - SHA512 f72aa207c18ddfcfc0fe5e367f985c3b56886d076ab3683ea47c890afacdb2856b1bd46407c6215647b446f028fd0ed3b91956ce6c92d65d573194e4798d2df4 + SHA512 ca08cb7d177932686111e8e8b4f5e2d7e63cb0ff307adf01f1b5705b0a9f9c119536d290ab0dc490aecb7b8deeaa0b2bdbab28853b7cca69d57acda027645ffd HEAD_REF master ) diff --git a/versions/o-/opennurbs.json b/versions/o-/opennurbs.json index 5b264b13474c43..d20cf7300ff708 100644 --- a/versions/o-/opennurbs.json +++ b/versions/o-/opennurbs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "52c9b6b0e8a13d924e0fc7f467d7ade8abb598f3", + "git-tree": "de6c425e816ecace4ba24507c75ba9421328b2e5", "version-string": "v7.11.21285.13001", "port-version": 0 } From 305312b027d54a0111baccd8c2de3d35e3605770 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Fri, 19 Nov 2021 15:35:30 -0600 Subject: [PATCH 09/11] [opennurbs] set -DCMAKE_FIND_FRAMEWORK=LAST --- ports/opennurbs/portfile.cmake | 1 + versions/o-/opennurbs.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/opennurbs/portfile.cmake b/ports/opennurbs/portfile.cmake index ebda134238a5a3..78135e0187e880 100644 --- a/ports/opennurbs/portfile.cmake +++ b/ports/opennurbs/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_cmake_configure( PREFER_NINJA OPTIONS -DOPENNURBS_SHARED=${OPENNURBS_SHARED} + -DCMAKE_FIND_FRAMEWORK=LAST ) vcpkg_cmake_build(TARGET opennurbs) diff --git a/versions/o-/opennurbs.json b/versions/o-/opennurbs.json index d20cf7300ff708..0c501de4baa136 100644 --- a/versions/o-/opennurbs.json +++ b/versions/o-/opennurbs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "de6c425e816ecace4ba24507c75ba9421328b2e5", + "git-tree": "341c02dc352dbc1d01f9af0dc54b812406f3118b", "version-string": "v7.11.21285.13001", "port-version": 0 } From 64ad7441f940b65852a5134752c535ca63947572 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Fri, 19 Nov 2021 18:07:22 -0600 Subject: [PATCH 10/11] [opennurbs] fix build on windows arm64 --- ports/opennurbs/portfile.cmake | 2 +- scripts/ci.baseline.txt | 1 - versions/o-/opennurbs.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/opennurbs/portfile.cmake b/ports/opennurbs/portfile.cmake index 78135e0187e880..e6f949f5692acf 100644 --- a/ports/opennurbs/portfile.cmake +++ b/ports/opennurbs/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aminya/opennurbs REF tags/${VERSION}_cmake - SHA512 ca08cb7d177932686111e8e8b4f5e2d7e63cb0ff307adf01f1b5705b0a9f9c119536d290ab0dc490aecb7b8deeaa0b2bdbab28853b7cca69d57acda027645ffd + SHA512 0f2c336463b4b7ba41ea480e964be47f7927ff93b97bdd4f241bab21e5bc99b893c4d24fd64cc768f056ce29076bb7a19ceccf7c3ffb8b84d370fc8186047249 HEAD_REF master ) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e1fbe99e56ab03..138e44276ab777 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1080,7 +1080,6 @@ openmpi:x86-windows=fail openni2:x64-uwp=fail openni2:x64-windows-static=fail opennurbs:x64-uwp=fail -opennurbs:arm64-windows=fail opennurbs:arm-uwp=fail openscap:x64-linux=fail openscap:x64-osx=fail diff --git a/versions/o-/opennurbs.json b/versions/o-/opennurbs.json index 0c501de4baa136..1998802b57af4f 100644 --- a/versions/o-/opennurbs.json +++ b/versions/o-/opennurbs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "341c02dc352dbc1d01f9af0dc54b812406f3118b", + "git-tree": "400f38befe59daad1127718bb8392787196883fa", "version-string": "v7.11.21285.13001", "port-version": 0 } From 6b517a2ef0552e9788b6cff01ca264a3da4762cb Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Mon, 22 Nov 2021 17:52:00 -0600 Subject: [PATCH 11/11] [opennurbs] add !uwp to the supports entry --- ports/opennurbs/vcpkg.json | 1 + scripts/ci.baseline.txt | 2 -- versions/o-/opennurbs.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/opennurbs/vcpkg.json b/ports/opennurbs/vcpkg.json index 11b5eb68275ffe..80fab368f263bb 100644 --- a/ports/opennurbs/vcpkg.json +++ b/ports/opennurbs/vcpkg.json @@ -2,6 +2,7 @@ "name": "opennurbs", "version-string": "v7.11.21285.13001", "description": "The openNURBS Initiative provides CAD, CAM, CAE, and computer graphics software developers the tools to accurately transfer 3D geometry between applications.", + "supports": "!uwp", "dependencies": [ "dirent", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 138e44276ab777..4bfdb19a1f6f2c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1079,8 +1079,6 @@ openmpi:x64-windows-static-md=fail openmpi:x86-windows=fail openni2:x64-uwp=fail openni2:x64-windows-static=fail -opennurbs:x64-uwp=fail -opennurbs:arm-uwp=fail openscap:x64-linux=fail openscap:x64-osx=fail openssl-unix:arm64-windows=fail diff --git a/versions/o-/opennurbs.json b/versions/o-/opennurbs.json index 1998802b57af4f..0202c2227c729e 100644 --- a/versions/o-/opennurbs.json +++ b/versions/o-/opennurbs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "400f38befe59daad1127718bb8392787196883fa", + "git-tree": "4f9bfd1fccd54ec29d3060ed22259c9bc7a96fa9", "version-string": "v7.11.21285.13001", "port-version": 0 }