aboutsummaryrefslogtreecommitdiff
path: root/ports/sqlpp11
diff options
context:
space:
mode:
authorLily <47812810+LilyWangL@users.noreply.github.com>2020-09-28 08:33:19 +0800
committerGitHub <noreply@github.com>2020-09-27 17:33:19 -0700
commitbfc0f488335725763b5e966641cbec738aa7a485 (patch)
treeccb508769ecbd3611bcf1034e1befae8a3702290 /ports/sqlpp11
parentae82a554f80e49f29d528f6ec395211ea0b7939b (diff)
downloadvcpkg-bfc0f488335725763b5e966641cbec738aa7a485.tar.gz
vcpkg-bfc0f488335725763b5e966641cbec738aa7a485.zip
[libyaml/sqlpp11/xeus/uvatlas/xxhash] Update to the latest version (#13657)
* [many ports] Update to the latest version * [xeus] Fix static build * [usd] Revert change * [xeus] Fix build error * [sqlpp11] Update latest version * [libyaml] Fix build error on Linux * [sqlpp11] Fix build error
Diffstat (limited to 'ports/sqlpp11')
-rw-r--r--ports/sqlpp11/CONTROL2
-rw-r--r--ports/sqlpp11/fix-dependency.patch20
-rw-r--r--ports/sqlpp11/portfile.cmake12
3 files changed, 28 insertions, 6 deletions
diff --git a/ports/sqlpp11/CONTROL b/ports/sqlpp11/CONTROL
index d35889f21..d6b6ad860 100644
--- a/ports/sqlpp11/CONTROL
+++ b/ports/sqlpp11/CONTROL
@@ -1,5 +1,5 @@
Source: sqlpp11
-Version: 0.59
+Version: 0.60
Homepage: https://github.com/rbock/sqlpp11
Description: A type safe embedded domain specific language for SQL queries and results in C++.
Build-Depends: date
diff --git a/ports/sqlpp11/fix-dependency.patch b/ports/sqlpp11/fix-dependency.patch
new file mode 100644
index 000000000..d43e10bf3
--- /dev/null
+++ b/ports/sqlpp11/fix-dependency.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8de9fa..82dd632 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,14 +32,11 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
+
+ include(CTest)
+
+-
+-### Dependencies
+-add_subdirectory(dependencies)
+-
+ ### Main targets
+ add_library(sqlpp11 INTERFACE)
+ add_library(sqlpp11::sqlpp11 ALIAS sqlpp11)
+
++find_package(date CONFIG REQUIRED)
+ target_link_libraries(sqlpp11 INTERFACE date::date)
+
+ target_include_directories(sqlpp11 INTERFACE
diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake
index c85f6ed10..312c16d4e 100644
--- a/ports/sqlpp11/portfile.cmake
+++ b/ports/sqlpp11/portfile.cmake
@@ -1,10 +1,12 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO rbock/sqlpp11
- REF 0.59
- SHA512 9da05e7a5163200040205b9740d6bf4ad1faa94b2bf031c16d896865b3f10e0fe95a0532a2c2e89adc051250a7f76c550a239916fdd700828d4fb1da566a4fe3
+ REF 085713d4d301aeb58e7d14f44cfac6ce35fe2e77 # 0.60
+ SHA512 835536482def61c9978cda58507a7f5983b99765f69e7865cf5597b06075dc3e7ad4a3be0b2de2e44e4a4c3a6998115bf567ff586fb656cf5d95a0a7465fb2fe
HEAD_REF master
- PATCHES ddl2cpp_path.patch
+ PATCHES
+ ddl2cpp_path.patch
+ fix-dependency.patch
)
# Use sqlpp11's own build process, skipping tests
@@ -12,7 +14,7 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
- -DENABLE_TESTS:BOOL=OFF
+ -DENABLE_TESTS:BOOL=OFF
)
vcpkg_install_cmake()
@@ -21,7 +23,7 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Sqlpp11 TARGET_PATH share/${PORT})
# Delete redundant and unnecessary directories
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/cmake ${CURRENT_PACKAGES_DIR}/include/date)
# Move python script from bin directory
file(COPY ${CURRENT_PACKAGES_DIR}/bin/sqlpp11-ddl2cpp DESTINATION ${CURRENT_PACKAGES_DIR}/scripts)