[libinterpolate] Add new port #44608
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| index 3aea49a..b21d330 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -17,9 +17,18 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} | ||
| set(CMAKE_EXPORT_COMPILE_COMMANDS ON) | ||
|
|
||
| if("${libInterpolate_VERSION}" STREQUAL "UNKNOWN") | ||
| - message(STATUS "Detecting version number using git...") | ||
| - include(macro-git_version) | ||
| - git_version(libInterpolate) | ||
| + find_package(Git QUIET) | ||
| + if(Git_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") | ||
| + message(STATUS "Detecting version number using git...") | ||
| + include(macro-git_version) | ||
| + git_version(libInterpolate) | ||
| + else() | ||
| + message(STATUS "Git not found or not a git repository. Setting default version.") | ||
| + set(libInterpolate_VERSION "0.0.0" CACHE STRING "Library version number" FORCE) | ||
| + set(libInterpolate_VERSION_MAJOR "0" CACHE INTERNAL "Library major version number") | ||
| + set(libInterpolate_VERSION_MINOR "0" CACHE INTERNAL "Library minor version number") | ||
| + set(libInterpolate_VERSION_PATCH "0" CACHE INTERNAL "Library patch version number") | ||
| + endif() | ||
| message(STATUS "Version: ${libInterpolate_VERSION}") | ||
| message(STATUS "Version (Full): ${libInterpolate_VERSION_FULL}") | ||
| endif() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,29 @@ | ||||||||||||||
| vcpkg_from_github( | ||||||||||||||
| OUT_SOURCE_PATH SOURCE_PATH | ||||||||||||||
| REPO CD3/libInterpolate | ||||||||||||||
| REF ${VERSION} | ||||||||||||||
| SHA512 6d53e1fb3af3067ddd13e491563e8da5af9756efba5a2def486f014c23969633ca73cf43dd2f93047716ebb6565f5e9911b6ab85abef2db3b9faefc26ab3aa59 | ||||||||||||||
| HEAD_REF master | ||||||||||||||
| PATCHES | ||||||||||||||
| fix-version-detection.patch | ||||||||||||||
| ) | ||||||||||||||
|
|
||||||||||||||
| set(VCPKG_BUILD_TYPE release) # header-only port | ||||||||||||||
|
|
||||||||||||||
| vcpkg_cmake_configure( | ||||||||||||||
| SOURCE_PATH "${SOURCE_PATH}" | ||||||||||||||
| OPTIONS | ||||||||||||||
| -DBUILD_TESTS=OFF | ||||||||||||||
| -DlibInterpolate_VERSION=${VERSION} | ||||||||||||||
| ) | ||||||||||||||
|
|
||||||||||||||
| vcpkg_cmake_install() | ||||||||||||||
| vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libInterpolate) | ||||||||||||||
| vcpkg_fixup_pkgconfig() | ||||||||||||||
|
|
||||||||||||||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") | ||||||||||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
This doesn't exist with |
||||||||||||||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") | ||||||||||||||
|
|
||||||||||||||
| file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) | ||||||||||||||
|
|
||||||||||||||
| configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) | ||||||||||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
Contributor
Author
There was a problem hiding this comment. Thank you, good suggestion. added |
||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,4 @@ | ||||||||||||||||||
| The package libInterpolate is header only and can be used from CMake via: | ||||||||||||||||||
|
|
||||||||||||||||||
| find_package(libInterpolate CONFIG REQUIRED) | ||||||||||||||||||
| target_link_libraries(main PRIVATE libInterpolate::Interpolate) | ||||||||||||||||||
|
Contributor
There was a problem hiding this comment. This probably mostly identical to the heuristical output?
Suggested change
|
||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "name": "libinterpolate", | ||
| "version": "2.7.1", | ||
| "description": "Header-only C++ interpolation library.", | ||
| "homepage": "https://github.com/CD3/libInterpolate", | ||
| "license": "MIT", | ||
| "dependencies": [ | ||
| "boost-geometry", | ||
| "boost-headers", | ||
| "boost-lexical-cast", | ||
| "boost-mpl", | ||
| "boost-program-options", | ||
| "boost-range", | ||
| "boost-tokenizer", | ||
| "boost-type-erasure", | ||
| "boost-type-traits", | ||
| { | ||
| "name": "eigen3", | ||
| "host": true, | ||
| "version>=": "3.4.0" | ||
| }, | ||
|
Niproblema marked this conversation as resolved.
Outdated
|
||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake-config", | ||
| "host": true | ||
| } | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "versions": [ | ||
| { | ||
| "git-tree": "ae153a19d43433e9dccd2f8cc7d8f925e5e9d4ba", | ||
| "version": "2.7.1", | ||
| "port-version": 0 | ||
| } | ||
| ] | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AFAICS this patch isn't needed: When
libInterpolate_VERSIONis passed as an input variable, the section is never entered.And
libInterpolate_VERSION_FULLisn't used anyways.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought that a fallback might be useful. Anyway, removed