mirror of
https://github.com/cuberite/SQLiteCpp.git
synced 2025-08-06 18:56:40 -04:00
Merge branch 'master' into temp-brnach
This commit is contained in:
commit
2ce092bfd1
@ -348,13 +348,6 @@ if (SQLITECPP_DISABLE_EXPANDED_SQL)
|
||||
target_compile_definitions(SQLiteCpp PUBLIC SQLITECPP_DISABLE_EXPANDED_SQL)
|
||||
endif (SQLITECPP_DISABLE_EXPANDED_SQL)
|
||||
|
||||
# Link target with pthread and dl for Unix
|
||||
if (UNIX)
|
||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||
find_package(Threads REQUIRED)
|
||||
target_link_libraries(SQLiteCpp PUBLIC Threads::Threads ${CMAKE_DL_LIBS})
|
||||
endif (UNIX)
|
||||
|
||||
# Set includes for target and transitive downstream targets
|
||||
|
||||
target_include_directories(SQLiteCpp
|
||||
|
@ -24,6 +24,18 @@ target_include_directories(sqlite3
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
||||
$<INSTALL_INTERFACE:include/>)
|
||||
|
||||
# Link target with pthread and dl for Unix
|
||||
if (UNIX)
|
||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||
find_package(Threads REQUIRED)
|
||||
target_link_libraries(sqlite3 PUBLIC Threads::Threads ${CMAKE_DL_LIBS})
|
||||
endif (UNIX)
|
||||
|
||||
target_include_directories(sqlite3 PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
||||
$<INSTALL_INTERFACE:include/>)
|
||||
|
||||
|
||||
if (SQLITE_ENABLE_COLUMN_METADATA)
|
||||
# Enable the use of SQLite column metadata method
|
||||
# Require that the sqlite3 library is also compiled with this flag:
|
||||
|
Loading…
x
Reference in New Issue
Block a user