1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
Link to system sqlite3 instead of bundled one.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -364,10 +364,6 @@
# temporary workaround for a gfortran v7.3 ICE on Fedora 27 64-bit
-set (sqlite3_CSRCS
- vendor/sqlite3/sqlite3.c
- )
-
set (wsjt_CSRCS
lib/gran.c
lib/init_random_seed.c
@@ -408,7 +404,6 @@
)
set (all_C_and_CXXSRCS
- ${sqlite3_CSRCS}
${wsjt_CSRCS}
${all_CXXSRCS}
)
@@ -580,6 +575,8 @@
find_package (Qt5AxContainer REQUIRED)
endif (WIN32)
+pkg_check_modules(SQLITE3 sqlite3>=3.26 REQUIRED)
+message (STATUS "SQLITE3_LIBRARIES: ${SQLITE3_LIBRARIES}")
#
# Library building setup
@@ -911,7 +908,6 @@
# build the main application
add_executable (js8call MACOSX_BUNDLE
- ${sqlite3_CSRCS}
${wsjtx_CXXSRCS}
${wsjtx_GENUISRCS}
wsjtx.rc
@@ -941,7 +937,7 @@
if (APPLE)
target_link_libraries (js8call wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
else ()
- target_link_libraries (js8call wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+ target_link_libraries (js8call wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES} ${SQLITE3_LIBRARIES})
if (OpenMP_C_FLAGS)
set_target_properties (js8call PROPERTIES
COMPILE_FLAGS "${OpenMP_C_FLAGS}"
--- a/Inbox.h
+++ b/Inbox.h
@@ -10,7 +10,7 @@
#include <QPair>
#include <QVariant>
-#include "vendor/sqlite3/sqlite3.h"
+#include "sqlite3.h"
#include "Message.h"
|
