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
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
Author: Andreas Tille <tille@debian.org>
Description: Use Debian packaged sqlite3
- in CMake
- in src/lib/setup.py
Reviewed-by: Étienne Mollier <etienne.mollier@mailoo.org>
Last-Update: 2020-09-24
Forwarded: not-needed
--- hyphy.orig/CMakeLists.txt
+++ hyphy/CMakeLists.txt
@@ -156,12 +156,11 @@
file(GLOB SRC_CONTRIB src/contrib/*.cpp)
set(SRC_LINK src/lib/link/THyPhy.cpp)
-set(SRC_SQLITE3 contrib/SQLite-3.8.2/sqlite3.c)
set(SRC_UNIXMAIN src/mains/unix.cpp)
set(SRC_UTILS src/utils/hyphyunixutils.cpp)
-set(SRC_COMMON ${SRC_CORE} ${SRC_NEW} ${SRC_SQLITE3} ${SRC_UTILS} ${SRC_CONTRIB})
+set(SRC_COMMON ${SRC_CORE} ${SRC_NEW} ${SRC_UTILS} ${SRC_CONTRIB})
set_source_files_properties(${SRC_CORE} ${SRC_NEW} {SRC_UTILS} PROPERTIES COMPILE_FLAGS "-Weffc++ -Wextra -Wall")
@@ -397,6 +396,35 @@
)
endif(NOT NODE)
+#-------------------------------------------------------------------------------
+# check for Debian packaged sqlite
+# stolen from https://sources.debian.net/src/u1db/13.10-6/debian/patches/fix_linking/?hl=103
+#-------------------------------------------------------------------------------
+find_package(PkgConfig)
+pkg_check_modules(PC_SQLITE3 sqlite3)
+
+find_path(SQLITE3_INCLUDE_DIR sqlite3.h
+ HINTS
+ ${PC_SQLITE3_INCLUDE_DIRS}
+ /usr/include
+ /usr/local/include
+ /opt/local/include
+)
+
+find_library(SQLITE3_LIBRARY
+ NAMES ${SQLITE3_NAMES} libsqlite3.so libsqlite3.a
+ HINTS ${PC_SQLITE3_LIBRARY_DIRS}
+ /usr/lib /usr/local/lib /opt/local/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SQLITE3 DEFAULT_MSG SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR)
+
+if(SQLITE3_FOUND)
+ # set(SQLITE3_LIBRARIES ${SQLITE3_LIBRARY})
+ set(DEFAULT_LIBRARIES dl pthread crypto curl ssl sqlite3)
+ set(SQLITE3_INCLUDE_DIRS ${SQLITE3_INCLUDE_DIR})
+endif()
#-------------------------------------------------------------------------------
# setup some source properties so that we don't spam stdout
@@ -407,11 +435,6 @@
)
set_property(
- SOURCE ${SRC_SQLITE3}
- APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast -std=c99"
-)
-
-set_property(
SOURCE src/core/calcnode2.cpp
APPEND_STRING PROPERTY COMPILE_FLAGS " -fstrict-aliasing -funroll-loops"
)
@@ -431,7 +454,6 @@
src/core/include
src/contrib
src/lib/Link src/new/include
- contrib/SQLite-3.8.2 # SQLite
)
if (${BLAS_FOUND} AND NOT NOBLAS)
|
