This commit is contained in:
klaus triendl 2023-03-28 23:52:42 +02:00 коммит произвёл GitHub
Родитель bca81ebd98
Коммит ef34901399
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 24 добавлений и 38 удалений

Просмотреть файл

@ -1,3 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a56294f29..d784c4d5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,8 +44,8 @@ set(SqliteOrm_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include")
add_library(sqlite_orm INTERFACE)
add_library(sqlite_orm::sqlite_orm ALIAS sqlite_orm)
-find_package(SQLite3 REQUIRED)
-target_link_libraries(sqlite_orm INTERFACE SQLite::SQLite3)
+find_package(unofficial-sqlite3 CONFIG REQUIRED)
+target_link_libraries(sqlite_orm INTERFACE unofficial::sqlite3::sqlite3)
target_sources(sqlite_orm INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/sqlite_orm/sqlite_orm.h>)
diff --git a/cmake/SqliteOrmConfig.cmake.in b/cmake/SqliteOrmConfig.cmake.in
index e0635d28a..30403cd41 100644
--- a/cmake/SqliteOrmConfig.cmake.in

Просмотреть файл

@ -1,33 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 436d30a6d..d64f3cbb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,15 +35,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
include(CTest)
### Dependencies
-add_subdirectory(dependencies)
### Main Build Targets
set(SqliteOrm_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include")
add_library(sqlite_orm INTERFACE)
add_library(sqlite_orm::sqlite_orm ALIAS sqlite_orm)
-find_package(SQLite3 REQUIRED)
-target_link_libraries(sqlite_orm INTERFACE SQLite::SQLite3)
+find_package(unofficial-sqlite3 CONFIG REQUIRED)
+target_link_libraries(sqlite_orm INTERFACE unofficial::sqlite3::sqlite3)
target_sources(sqlite_orm INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/sqlite_orm/sqlite_orm.h>)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2857b659e..3ee46e625 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -4,5 +4,5 @@ file(GLOB files "*.cpp")
foreach(file ${files})
get_filename_component(file_basename ${file} NAME_WE)
add_executable(${file_basename} ${file})
- target_link_libraries(${file_basename} PRIVATE sqlite_orm sqlite3)
+ target_link_libraries(${file_basename} PRIVATE sqlite_orm)
endforeach()

Просмотреть файл

@ -3,11 +3,10 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fnc12/sqlite_orm
REF v1.8.1
SHA512 ada0571a5fb5f8eaec24b5046b9b7eb4de4656ebf5b9e413be8e7348d2169b34111a423c8af3128baaed48dbc945bbce0b1794527f737818b1c9153a13bbcb9a
REF v1.8.2
SHA512 65479c02246d96bfa0a6a5ed749e15650e71114c1145d17bd48f1a57560c9f494148253064f720dd43773ac9971a85635c9d4927f3b336590188339b3d656b33
HEAD_REF master
PATCHES
fix-features-build-error.patch
fix-dependency.patch
)

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "sqlite-orm",
"version": "1.8.1",
"version": "1.8.2",
"description": "SQLite ORM light header only library for modern C++",
"homepage": "https://github.com/fnc12/sqlite_orm",
"license": "AGPL-3.0-or-later OR MIT",

Просмотреть файл

@ -7537,7 +7537,7 @@
"port-version": 1
},
"sqlite-orm": {
"baseline": "1.8.1",
"baseline": "1.8.2",
"port-version": 0
},
"sqlite3": {

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d46221e51b059d05e7f65620b5e377fdc3673d74",
"version": "1.8.2",
"port-version": 0
},
{
"git-tree": "cbb80bd62fb69f81d00cc551f1033b31df52ca2d",
"version": "1.8.1",