diff --git a/ports/sqlite-orm/fix-features-build-error.patch b/ports/sqlite-orm/fix-features-build-error.patch index ce34583d17..fa7ca257a7 100644 --- a/ports/sqlite-orm/fix-features-build-error.patch +++ b/ports/sqlite-orm/fix-features-build-error.patch @@ -1,8 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index dd86d2f..6696809 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -32,15 +32,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") +@@ -31,15 +31,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") include(CTest) ### Dependencies @@ -35,16 +34,12 @@ diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fd41e70..8087899 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt -@@ -7,9 +7,11 @@ option(SqliteOrm_SysSqlite "Use system version of sqlite library" OFF) - if(SqliteOrm_SysSqlite) - message(FATAL_ERROR "WIP: please, disable the SqliteOrm_SysSqlite option.") - else() -- add_subdirectory(third_party/sqlite) -+ find_package(unofficial-sqlite3 CONFIG REQUIRED) - endif() +@@ -0,6 +0,8 @@ + cmake_minimum_required (VERSION 3.2) -+find_package(Catch2 CONFIG REQUIRED) + option(SQLITE_ORM_OMITS_CODECVT "Omits codec testing" OFF) + - add_executable(unit_tests tests.cpp tests2.cpp tests3.cpp tests4.cpp tests5.cpp private_getters_tests.cpp pragma_tests.cpp explicit_columns.cpp core_functions_tests.cpp index_tests.cpp constraints/composite_key.cpp static_tests.cpp operators/arithmetic_operators.cpp operators/like.cpp operators/glob.cpp operators/in.cpp operators/cast.cpp operators/is_null.cpp operators/not_operator.cpp operators/bitwise.cpp dynamic_order_by.cpp prepared_statement_tests/select.cpp prepared_statement_tests/get_all.cpp prepared_statement_tests/get_all_pointer.cpp prepared_statement_tests/get_all_optional.cpp prepared_statement_tests/update_all.cpp prepared_statement_tests/remove_all.cpp prepared_statement_tests/get.cpp prepared_statement_tests/get_pointer.cpp prepared_statement_tests/get_optional.cpp prepared_statement_tests/update.cpp prepared_statement_tests/remove.cpp prepared_statement_tests/insert.cpp prepared_statement_tests/replace.cpp prepared_statement_tests/insert_range.cpp prepared_statement_tests/replace_range.cpp prepared_statement_tests/insert_explicit.cpp pragma_tests.cpp simple_query.cpp static_tests/is_bindable.cpp static_tests/arithmetic_operators_result_type.cpp static_tests/tuple_conc.cpp static_tests/node_tuple.cpp static_tests/bindable_filter.cpp static_tests/count_tuple.cpp static_tests/member_traits_tests.cpp static_tests/select_return_type.cpp constraints/default.cpp constraints/unique.cpp constraints/foreign_key.cpp constraints/check.cpp table_tests.cpp statement_serializator_tests/primary_key.cpp statement_serializator_tests/column_names.cpp statement_serializator_tests/autoincrement.cpp statement_serializator_tests/arithmetic_operators.cpp statement_serializator_tests/core_functions.cpp statement_serializator_tests/comparison_operators.cpp statement_serializator_tests/unique.cpp statement_serializator_tests/foreign_key.cpp statement_serializator_tests/collate.cpp statement_serializator_tests/check.cpp statement_serializator_tests/index.cpp statement_serializator_tests/indexed_column.cpp unique_cases/get_all_with_two_tables.cpp unique_cases/prepare_get_all_with_case.cpp unique_cases/index_named_table_with_fk.cpp unique_cases/issue525.cpp unique_cases/delete_with_two_fields.cpp unique_cases/join_iterator_ctor_compilation_error.cpp get_all_custom_containers.cpp select_asterisk.cpp backup_tests.cpp transaction_tests.cpp) - ++find_package(Catch2 CONFIG REQUIRED) + add_executable(unit_tests + tests.cpp diff --git a/ports/sqlite-orm/portfile.cmake b/ports/sqlite-orm/portfile.cmake index e72426449a..fc222dc584 100644 --- a/ports/sqlite-orm/portfile.cmake +++ b/ports/sqlite-orm/portfile.cmake @@ -1,12 +1,10 @@ # header-only library -set(FEATURE_PATCHES) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fnc12/sqlite_orm - REF 4c6a46bd4dcfba14a650e0fafb86331526878587 # 1.6 - SHA512 9626fc20374aff5da718d32c7b942a7a6434920da9cf68df6146e9c25cca61936c2e3091c6476c369c8bf241dcb8473169ee726eaedfeb92d79ff4fa8a6b2d32 + REF v1.7 + SHA512 482096eed5ef10968198a5e34c160db61a6339c8c0c098419b31fe2931f8ba0aa4a7a676c914eb7cf6202f0b0cc0e1932f92e1e07fedd7a961cfc66ddbb6730b HEAD_REF master PATCHES fix-features-build-error.patch @@ -14,22 +12,23 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - test BUILD_TESTING - example BUILD_EXAMPLES + FEATURES + test BUILD_TESTING + example BUILD_EXAMPLES ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} -DSQLITE_ORM_ENABLE_CXX_17=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SqliteOrm TARGET_PATH share/SqliteOrm) +vcpkg_cmake_config_fixup(PACKAGE_NAME SqliteOrm CONFIG_PATH lib/cmake/SqliteOrm) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/sqlite-orm/vcpkg.json b/ports/sqlite-orm/vcpkg.json index ab5e89652e..a56f35cd7a 100644 --- a/ports/sqlite-orm/vcpkg.json +++ b/ports/sqlite-orm/vcpkg.json @@ -1,11 +1,18 @@ { "name": "sqlite-orm", - "version-string": "1.6", - "port-version": 1, + "version": "1.7", "description": "SQLite ORM light header only library for modern C++", "homepage": "https://github.com/fnc12/sqlite_orm", "dependencies": [ - "sqlite3" + "sqlite3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "example": { diff --git a/versions/baseline.json b/versions/baseline.json index f38969c8e7..93a183858d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6481,8 +6481,8 @@ "port-version": 1 }, "sqlite-orm": { - "baseline": "1.6", - "port-version": 1 + "baseline": "1.7", + "port-version": 0 }, "sqlite3": { "baseline": "3.36.0", diff --git a/versions/s-/sqlite-orm.json b/versions/s-/sqlite-orm.json index 16d45a07cd..a69988e0b3 100644 --- a/versions/s-/sqlite-orm.json +++ b/versions/s-/sqlite-orm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57c4daa9dadbff1a2f6c088f6716bd14b638984b", + "version": "1.7", + "port-version": 0 + }, { "git-tree": "be577f000372e4ae6d9675bdb10ff25dce38d90d", "version-string": "1.6",