diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2021-06-11 07:02:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-10 16:02:29 -0700 |
| commit | 4ea49a1cf82f93784a220bc1d1d998d2c1d4180f (patch) | |
| tree | 9f986db1bebea68a9b78ca6bf9260d4d04368ceb /ports/xtl | |
| parent | 0d0f8e7e8d81d059e96da253361c4bef0b9e569b (diff) | |
| download | vcpkg-4ea49a1cf82f93784a220bc1d1d998d2c1d4180f.tar.gz vcpkg-4ea49a1cf82f93784a220bc1d1d998d2c1d4180f.zip | |
[xtensor] update to 0.23.9 (#18206)
* [xtensor] update to 0.23.9
* update version
* [xtl] update to 0.7.2
* update version
* update patch
* update version
* Update ports/xtl/portfile.cmake
* update version
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Diffstat (limited to 'ports/xtl')
| -rw-r--r-- | ports/xtl/CONTROL | 5 | ||||
| -rw-r--r-- | ports/xtl/fix-fixup-cmake.patch | 19 | ||||
| -rw-r--r-- | ports/xtl/portfile.cmake | 8 | ||||
| -rw-r--r-- | ports/xtl/vcpkg.json | 9 |
4 files changed, 34 insertions, 7 deletions
diff --git a/ports/xtl/CONTROL b/ports/xtl/CONTROL deleted file mode 100644 index 41cd7e88b..000000000 --- a/ports/xtl/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: xtl
-Version: 0.6.21
-Build-Depends: nlohmann-json
-Description: The x template library.
-Homepage: https://github.com/xtensor-stack/xtl
diff --git a/ports/xtl/fix-fixup-cmake.patch b/ports/xtl/fix-fixup-cmake.patch new file mode 100644 index 000000000..9bc25bf0b --- /dev/null +++ b/ports/xtl/fix-fixup-cmake.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cbc6651..4e31f71 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,7 +122,7 @@ install(FILES ${XTL_HEADERS}
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtl)
+ endif()
+
+-set(XTL_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}" CACHE
++set(XTL_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE
+ STRING "install path for xtlConfig.cmake")
+
+ configure_package_config_file(${PROJECT_NAME}Config.cmake.in
+@@ -157,4 +157,4 @@ configure_file(${PROJECT_NAME}.pc.in
+ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+ @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+- DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig/")
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
diff --git a/ports/xtl/portfile.cmake b/ports/xtl/portfile.cmake index 5c761315a..6dd16a174 100644 --- a/ports/xtl/portfile.cmake +++ b/ports/xtl/portfile.cmake @@ -3,9 +3,11 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO xtensor-stack/xtl
- REF 6c017f4a81a59bd52008025a785ce745e5b7f49c # 0.6.21
- SHA512 f007196a38da267b6f457ce587220b60686b1c23670ab03d5f0516bb3b8c7b1e5b8859d57255e96f713bfc08a46d38dd497e55afc17fa40f2b653073690093c9
+ REF e0f00666d90086bb245ae73abb6123d0e2c1b30b # 0.7.2
+ SHA512 d7a552dc4e43a3270a56c57fde8fdc48a108909d4fa1e3fdd7ab12b178b3e271ed4d89aac9fd184e2739ddacfb3b5cb248538ed50a0ba56e740875c0faf5aa62
HEAD_REF master
+ PATCHES
+ fix-fixup-cmake.patch
)
vcpkg_configure_cmake(
@@ -20,6 +22,8 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_fixup_pkgconfig()
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/xtl/vcpkg.json b/ports/xtl/vcpkg.json new file mode 100644 index 000000000..3570c661f --- /dev/null +++ b/ports/xtl/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "xtl", + "version": "0.7.2", + "description": "The x template library", + "homepage": "https://github.com/xtensor-stack/xtl", + "dependencies": [ + "nlohmann-json" + ] +} |