Skip to content

Commit efc3ef9

Browse files
committed
SQLite as shared lib
1 parent c35bc9d commit efc3ef9

2 files changed

Lines changed: 20 additions & 3 deletions

File tree

cmake/Dependencies.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,9 @@ macro(DeployWindows TARGET)
517517
# Copy MQTT
518518
install(CODE [[ file(INSTALL FILES $<TARGET_FILE:qmqtt> DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE SHARED_LIBRARY) ]] COMPONENT "HyperHDR")
519519

520+
# Copy SQLITE3
521+
install(CODE [[ file(INSTALL FILES $<TARGET_FILE:sqlite3> DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE SHARED_LIBRARY) ]] COMPONENT "HyperHDR")
522+
520523
# Create a qt.conf file in 'bin' to override hard-coded search paths in Qt plugins
521524
file(WRITE "${CMAKE_BINARY_DIR}/qt.conf" "[Paths]\nPlugins=../lib/\n")
522525
install(

external/CMakeLists.txt

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,38 @@
22
# SQLite
33
#=============================================================================
44

5-
add_library(sqlite3 "${CMAKE_CURRENT_SOURCE_DIR}/sqlite/sqlite3.c")
5+
add_library(sqlite3 SHARED "${CMAKE_CURRENT_SOURCE_DIR}/sqlite/sqlite3.c")
66
target_include_directories(sqlite3 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/sqlite")
77
target_link_libraries(sqlite3 PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
8-
8+
install(TARGETS sqlite3 LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
99

1010
set_target_properties(sqlite3 PROPERTIES
1111
OUTPUT_NAME sqlite3
1212
PUBLIC_HEADER sqlite3.h
1313
)
1414

1515
target_compile_definitions(sqlite3 PUBLIC
16-
SQLITE_THREADSAFE=1
16+
SQLITE_THREADSAFE=2
1717
SQLITE_DEFAULT_MEMSTATUS=0
1818
SQLITE_DEFAULT_SYNCHRONOUS=3
1919
SQLITE_OMIT_AUTHORIZATION
2020
SQLITE_OMIT_DEPRECATED
2121
)
2222

23+
if(WIN32)
24+
target_compile_definitions(sqlite3
25+
INTERFACE
26+
"SQLITE_API=__declspec(dllimport)"
27+
PRIVATE
28+
"SQLITE_API=__declspec(dllexport)"
29+
)
30+
else()
31+
target_compile_definitions(sqlite3
32+
INTERFACE
33+
"SQLITE_API=__attribute__((visibility(\"default\")))"
34+
)
35+
endif()
36+
2337
#=============================================================================
2438
# RPi ws281x
2539
#=============================================================================

0 commit comments

Comments
 (0)