diff --git a/ports/sqlpp11-connector-mysql/CONTROL b/ports/sqlpp11-connector-mysql/CONTROL index 9b3115fc197..cfed369d4f8 100644 --- a/ports/sqlpp11-connector-mysql/CONTROL +++ b/ports/sqlpp11-connector-mysql/CONTROL @@ -1,5 +1,14 @@ Source: sqlpp11-connector-mysql -Version: 0.29 -Description: A C++ wrapper for MySQL meant to be used in combination with sqlpp11. -Build-Depends: date, libmariadb, sqlpp11 +Version: 0.29-1 Homepage: https://github.com/rbock/sqlpp11-connector-mysql +Description: A C++ wrapper for MySQL meant to be used in combination with sqlpp11. +Build-Depends: date, sqlpp11 +Default-Features: mariadb + +Feature: mariadb +Description: Use MariaDB connector +Build-Depends: libmariadb + +Feature: mysql +Description: Use MySQL connector +Build-Depends: libmysql diff --git a/ports/sqlpp11/CONTROL b/ports/sqlpp11/CONTROL index 0d4e6ae9cb0..d35889f212e 100644 --- a/ports/sqlpp11/CONTROL +++ b/ports/sqlpp11/CONTROL @@ -1,4 +1,5 @@ Source: sqlpp11 -Version: 0.58-3 +Version: 0.59 +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/ddl2cpp_path.patch b/ports/sqlpp11/ddl2cpp_path.patch index b3c16570b8a..bc828e829f3 100644 --- a/ports/sqlpp11/ddl2cpp_path.patch +++ b/ports/sqlpp11/ddl2cpp_path.patch @@ -1,13 +1,13 @@ diff --git a/cmake/Sqlpp11Config.cmake b/cmake/Sqlpp11Config.cmake -index 720fef2..d8f93b8 100644 +index 18ea9b1..730bce1 100644 --- a/cmake/Sqlpp11Config.cmake +++ b/cmake/Sqlpp11Config.cmake -@@ -34,7 +34,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/Sqlpp11Targets.cmake") - if(TARGET sqlpp11::ddl2cpp) - message(FATAL_ERROR "Target sqlpp11::ddl2cpp already defined") - endif() --get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../../bin/sqlpp11-ddl2cpp" REALPATH) -+get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../scripts/sqlpp11-ddl2cpp" REALPATH) - if(NOT EXISTS "${sqlpp11_ddl2cpp_location}") - message(FATAL_ERROR "The imported target sqlpp11::ddl2cpp references the file '${sqlpp11_ddl2cpp_location}' but this file does not exists.") - endif() +@@ -32,7 +32,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/Sqlpp11Targets.cmake") + + # Import "ddl2cpp" script + if(NOT TARGET sqlpp11::ddl2cpp) +- get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../../bin/sqlpp11-ddl2cpp" REALPATH) ++ get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../scripts/sqlpp11-ddl2cpp" REALPATH) + if(NOT EXISTS "${sqlpp11_ddl2cpp_location}") + message(FATAL_ERROR "The imported target sqlpp11::ddl2cpp references the file '${sqlpp11_ddl2cpp_location}' but this file does not exists.") + endif() diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake index 596df39773b..c85f6ed107c 100644 --- a/ports/sqlpp11/portfile.cmake +++ b/ports/sqlpp11/portfile.cmake @@ -1,12 +1,10 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rbock/sqlpp11 - REF 0.58 - SHA512 c391e72638a748e0e25b53176dc371ba468bc14bdcb6dda2f2418c4ab4d620ebc5507ee284ff81c3104888d0d959703c6c91b55ccd69a8641b07dcb20cd56209 + REF 0.59 + SHA512 9da05e7a5163200040205b9740d6bf4ad1faa94b2bf031c16d896865b3f10e0fe95a0532a2c2e89adc051250a7f76c550a239916fdd700828d4fb1da566a4fe3 HEAD_REF master - PATCHES ddl2cpp_path.patch + PATCHES ddl2cpp_path.patch ) # Use sqlpp11's own build process, skipping tests @@ -16,12 +14,11 @@ vcpkg_configure_cmake( OPTIONS -DENABLE_TESTS:BOOL=OFF ) - + vcpkg_install_cmake() # Move CMake config files to the right place -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Sqlpp11 TARGET_PATH share/sqlpp11) - +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) @@ -31,4 +28,4 @@ file(COPY ${CURRENT_PACKAGES_DIR}/bin/sqlpp11-ddl2cpp DESTINATION ${CURRENT_PACK file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11 RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)