Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sqlite3 and mariadb when using vcpkg (#1165)

This commit is contained in:
X-rays5 2022-01-25 14:00:56 +01:00 committed by GitHub
parent bbc31612fc
commit 92d39fb174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
CMakeLists.txt
View File

@ -359,11 +359,19 @@ if (BUILD_POSTGRESQL)
endif (BUILD_POSTGRESQL) endif (BUILD_POSTGRESQL)
if (BUILD_MYSQL) if (BUILD_MYSQL)
# Find mysql, only mariadb client liberary is supported # Find mysql, only mariadb client library is supported
find_package(MySQL) find_package(MySQL QUIET)
find_package(unofficial-libmariadb QUIET)
if (MySQL_FOUND) if (MySQL_FOUND)
message(STATUS "Ok! We find the mariadb!")
target_link_libraries(${PROJECT_NAME} PRIVATE MySQL_lib) target_link_libraries(${PROJECT_NAME} PRIVATE MySQL_lib)
set(DROGON_FOUND_MYSQL TRUE)
elseif (unofficial-libmariadb_FOUND)
target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::libmariadb)
set(DROGON_FOUND_MYSQL TRUE)
endif ()
if (DROGON_FOUND_MYSQL)
message(STATUS "Ok! We find mariadb!")
set(DROGON_SOURCES set(DROGON_SOURCES
${DROGON_SOURCES} ${DROGON_SOURCES}
orm_lib/src/mysql_impl/MysqlConnection.cc orm_lib/src/mysql_impl/MysqlConnection.cc
@ -372,14 +380,25 @@ if (BUILD_MYSQL)
${private_headers} ${private_headers}
orm_lib/src/mysql_impl/MysqlConnection.h orm_lib/src/mysql_impl/MysqlConnection.h
orm_lib/src/mysql_impl/MysqlResultImpl.h) orm_lib/src/mysql_impl/MysqlResultImpl.h)
endif (MySQL_FOUND) else (DROGON_FOUND_MYSQL)
message(STATUS "MySql was not found.")
endif (DROGON_FOUND_MYSQL)
endif (BUILD_MYSQL) endif (BUILD_MYSQL)
if (BUILD_SQLITE) if (BUILD_SQLITE)
# Find sqlite3. # Find sqlite3.
find_package(SQLite3) find_package(SQLite3 QUIET)
find_package(unofficial-sqlite3 QUIET)
if (SQLite3_FOUND) if (SQLite3_FOUND)
target_link_libraries(${PROJECT_NAME} PRIVATE SQLite3_lib) target_link_libraries(${PROJECT_NAME} PRIVATE SQLite3_lib)
set(DROGON_FOUND_SQLite3 TRUE)
elseif (unofficial-sqlite3_FOUND)
target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::sqlite3::sqlite3)
set(DROGON_FOUND_SQLite3 TRUE)
endif ()
if (DROGON_FOUND_SQLite3)
message(STATUS "Ok! We find sqlite3!")
set(DROGON_SOURCES set(DROGON_SOURCES
${DROGON_SOURCES} ${DROGON_SOURCES}
orm_lib/src/sqlite3_impl/Sqlite3Connection.cc orm_lib/src/sqlite3_impl/Sqlite3Connection.cc
@ -388,7 +407,9 @@ if (BUILD_SQLITE)
${private_headers} ${private_headers}
orm_lib/src/sqlite3_impl/Sqlite3Connection.h orm_lib/src/sqlite3_impl/Sqlite3Connection.h
orm_lib/src/sqlite3_impl/Sqlite3ResultImpl.h) orm_lib/src/sqlite3_impl/Sqlite3ResultImpl.h)
endif (SQLite3_FOUND) else (DROGON_FOUND_SQLite3)
message(STATUS "sqlite3 was not found.")
endif (DROGON_FOUND_SQLite3)
endif (BUILD_SQLITE) endif (BUILD_SQLITE)
if (BUILD_REDIS) if (BUILD_REDIS)
@ -533,15 +554,15 @@ set(private_headers
orm_lib/src/DbConnection.h orm_lib/src/DbConnection.h
orm_lib/src/ResultImpl.h orm_lib/src/ResultImpl.h
orm_lib/src/TransactionImpl.h) orm_lib/src/TransactionImpl.h)
if (pg_FOUND OR MySQL_FOUND OR SQLite3_FOUND) if (pg_FOUND OR DROGON_FOUND_MYSQL OR DROGON_FOUND_SQLite3)
set(DROGON_SOURCES set(DROGON_SOURCES
${DROGON_SOURCES} ${DROGON_SOURCES}
orm_lib/src/DbClientManager.cc) orm_lib/src/DbClientManager.cc)
else (pg_FOUND OR MySQL_FOUND OR SQLite3_FOUND) else (pg_FOUND OR DROGON_FOUND_MYSQL OR DROGON_FOUND_SQLite3)
set(DROGON_SOURCES set(DROGON_SOURCES
${DROGON_SOURCES} ${DROGON_SOURCES}
lib/src/DbClientManagerSkipped.cc) lib/src/DbClientManagerSkipped.cc)
endif (pg_FOUND OR MySQL_FOUND OR SQLite3_FOUND) endif (pg_FOUND OR DROGON_FOUND_MYSQL OR DROGON_FOUND_SQLite3)
set_target_properties(${PROJECT_NAME} set_target_properties(${PROJECT_NAME}
PROPERTIES CXX_STANDARD ${DROGON_CXX_STANDARD}) PROPERTIES CXX_STANDARD ${DROGON_CXX_STANDARD})
@ -549,25 +570,25 @@ set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD_REQUIRED ON)
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF) set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME Drogon) set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME Drogon)
if (pg_FOUND OR MySQL_FOUND OR SQLite3_FOUND) if (pg_FOUND OR DROGON_FOUND_MYSQL OR DROGON_FOUND_SQLite3)
if (pg_FOUND) if (pg_FOUND)
option(USE_POSTGRESQL "Enable PostgreSQL" ON) option(USE_POSTGRESQL "Enable PostgreSQL" ON)
else (pg_FOUND) else (pg_FOUND)
option(USE_POSTGRESQL "Disable PostgreSQL" OFF) option(USE_POSTGRESQL "Disable PostgreSQL" OFF)
endif (pg_FOUND) endif (pg_FOUND)
if (MySQL_FOUND) if (DROGON_FOUND_MYSQL)
option(USE_MYSQL "Enable Mysql" ON) option(USE_MYSQL "Enable Mysql" ON)
else (MySQL_FOUND) else (DROGON_FOUND_MYSQL)
option(USE_MYSQL "Disable Mysql" OFF) option(USE_MYSQL "Disable Mysql" OFF)
endif (MySQL_FOUND) endif (DROGON_FOUND_MYSQL)
if (SQLite3_FOUND) if (DROGON_FOUND_SQLite3)
option(USE_SQLITE3 "Enable Sqlite3" ON) option(USE_SQLITE3 "Enable Sqlite3" ON)
else (SQLite3_FOUND) else (DROGON_FOUND_SQLite3)
option(USE_SQLITE3 "Disable Sqlite3" OFF) option(USE_SQLITE3 "Disable Sqlite3" OFF)
endif (SQLite3_FOUND) endif (DROGON_FOUND_SQLite3)
endif (pg_FOUND OR MySQL_FOUND OR SQLite3_FOUND) endif (pg_FOUND OR DROGON_FOUND_MYSQL OR DROGON_FOUND_SQLite3)
set(COMPILER_COMMAND ${CMAKE_CXX_COMPILER}) set(COMPILER_COMMAND ${CMAKE_CXX_COMPILER})
set(COMPILER_ID ${CMAKE_CXX_COMPILER_ID}) set(COMPILER_ID ${CMAKE_CXX_COMPILER_ID})
@ -605,12 +626,12 @@ if (BUILD_TESTING)
if (pg_FOUND) if (pg_FOUND)
add_subdirectory(${PROJECT_SOURCE_DIR}/orm_lib/src/postgresql_impl/test) add_subdirectory(${PROJECT_SOURCE_DIR}/orm_lib/src/postgresql_impl/test)
endif (pg_FOUND) endif (pg_FOUND)
if (MySQL_FOUND) if (DROGON_FOUND_MYSQL)
add_subdirectory(${PROJECT_SOURCE_DIR}/orm_lib/src/mysql_impl/test) add_subdirectory(${PROJECT_SOURCE_DIR}/orm_lib/src/mysql_impl/test)
endif (MySQL_FOUND) endif (DROGON_FOUND_MYSQL)
if (SQLite3_FOUND) if (DROGON_FOUND_SQLite3)
add_subdirectory(${PROJECT_SOURCE_DIR}/orm_lib/src/sqlite3_impl/test) add_subdirectory(${PROJECT_SOURCE_DIR}/orm_lib/src/sqlite3_impl/test)
endif (SQLite3_FOUND) endif (DROGON_FOUND_SQLite3)
add_subdirectory(${PROJECT_SOURCE_DIR}/orm_lib/tests) add_subdirectory(${PROJECT_SOURCE_DIR}/orm_lib/tests)
endif (BUILD_TESTING) endif (BUILD_TESTING)