aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchausner <15180557+chausner@users.noreply.github.com>2021-10-13 23:08:56 +0200
committerGitHub <noreply@github.com>2021-10-13 14:08:56 -0700
commit81817d7b4e4a26187c8c405ca5f8a4ff57077736 (patch)
tree2d63f605f230f3749fab75b9d7ae4fb20138adb0
parent9451badf3e48a5e728ea9b132719bf472a557324 (diff)
downloadvcpkg-81817d7b4e4a26187c8c405ca5f8a4ff57077736.tar.gz
vcpkg-81817d7b4e4a26187c8c405ca5f8a4ff57077736.zip
[tinyspline] Update to 0.3.0 (#20608)
* Update tinyspline to 0.3.0 * Update CI baseline * Fixes * Update git-tree hash * Fix lib output folder on 64-bit architectures * Update git-tree hash * Add homepage * Update git-tree hash Co-authored-by: chausner <chausner@users.noreply.github.com>
-rw-r--r--ports/tinyspline/001-do-not-treat-warnings-as-errors.patch18
-rw-r--r--ports/tinyspline/portfile.cmake29
-rw-r--r--ports/tinyspline/vcpkg.json16
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/t-/tinyspline.json5
5 files changed, 37 insertions, 35 deletions
diff --git a/ports/tinyspline/001-do-not-treat-warnings-as-errors.patch b/ports/tinyspline/001-do-not-treat-warnings-as-errors.patch
deleted file mode 100644
index 576174891..000000000
--- a/ports/tinyspline/001-do-not-treat-warnings-as-errors.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 02dfb83..52f5125 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -386,11 +386,11 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-
- # TINYSPLINE_LIBRARY_C_FLAGS
- set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /Wall")
-- set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /WX")
-+ # set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /WX")
-
- # TINYSPLINE_LIBRARY_CXX_FLAGS
- set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /Wall")
-- set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /WX")
-+ # set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /WX")
- set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4514")
- set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4710")
- set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4350")
diff --git a/ports/tinyspline/portfile.cmake b/ports/tinyspline/portfile.cmake
index a62d2f42c..1bf5180b3 100644
--- a/ports/tinyspline/portfile.cmake
+++ b/ports/tinyspline/portfile.cmake
@@ -1,25 +1,30 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO msteinbeck/tinyspline
- REF 0.2.0
- SHA512 50cf4927b311eeca6de7954f1b8d585cbf71355f5e5b0aac2f92f5f4ba37986df16eb3251f94a2304d27dab27d4f6b838b410f53e30de28bab53facf194eb640
+ REF v0.3.0
+ SHA512 9B02ACA5C56341E8DDC057E2AEB78632695DAC3A4D2C628A43028E4216FC79942F68DD3105B1B92ACAE0D009109C56EC437AB638FB7334EBDD68543BE2D8D7F6
HEAD_REF master
- PATCHES
- "001-do-not-treat-warnings-as-errors.patch"
)
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}/src
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
+ OPTIONS
+ -DTINYSPLINE_BUILD_EXAMPLES=OFF
+ -DTINYSPLINE_BUILD_TESTS=OFF
+ -DTINYSPLINE_BUILD_DOCS=OFF
+ -DTINYSPLINE_WARNINGS_AS_ERRORS=OFF
+ -DTINYSPLINE_INSTALL_LIBRARY_DIR=lib
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tinyspline DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tinysplinecxx)
+vcpkg_fixup_pkgconfig()
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/tinyspline/copyright COPYONLY)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/tinyspline/vcpkg.json b/ports/tinyspline/vcpkg.json
index bd01f70b9..91ed149d6 100644
--- a/ports/tinyspline/vcpkg.json
+++ b/ports/tinyspline/vcpkg.json
@@ -1,6 +1,16 @@
{
"name": "tinyspline",
- "version-string": "0.2.0",
- "port-version": 4,
- "description": "Library for NURBS, B-Splines, and B?zier curves, allowing you to handle splines with ease"
+ "version": "0.3.0",
+ "description": "Library for NURBS, B-Splines, and Bézier curves, allowing you to handle splines with ease",
+ "homepage": "https://github.com/msteinbeck/tinyspline",
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
+ ]
}
diff --git a/versions/baseline.json b/versions/baseline.json
index 79dae143f..dcda89aac 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6657,8 +6657,8 @@
"port-version": 1
},
"tinyspline": {
- "baseline": "0.2.0",
- "port-version": 4
+ "baseline": "0.3.0",
+ "port-version": 0
},
"tinythread": {
"baseline": "1.1",
diff --git a/versions/t-/tinyspline.json b/versions/t-/tinyspline.json
index 5958c4062..0b3978c2b 100644
--- a/versions/t-/tinyspline.json
+++ b/versions/t-/tinyspline.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "4e3b92c86bcbdd44171e07b3421d56f07e302fe4",
+ "version": "0.3.0",
+ "port-version": 0
+ },
+ {
"git-tree": "393f891a892f72ee95dde573dbc6ec87992e564a",
"version-string": "0.2.0",
"port-version": 4