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
|
From: James Cowgill <jcowgill@debian.org>
Date: Mon, 21 Feb 2022 20:37:25 +0100
Subject: Remove bundled wxsqlite3 from CMakeLists.txt files
Forwarded: not-needed
---
CMakeLists.txt | 5 +----
CodeLite/CMakeLists.txt | 2 +-
wxcrafter/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -819,7 +819,6 @@
endif()
# build the Core part of CodeLite (regardless of the final target)
-add_subdirectory(sdk/wxsqlite3)
add_subdirectory(sdk/wxshapeframework)
add_subdirectory(sdk/databaselayer)
add_subdirectory(CodeLite)
@@ -928,9 +927,7 @@
add_dependencies(wxsqlite3 sqlite3lib)
endif()
- add_dependencies(databaselayersqlite wxsqlite3)
- add_dependencies(wxshapeframework wxsqlite3)
- add_dependencies(libcodelite wxshapeframework databaselayersqlite wxsqlite3)
+ add_dependencies(libcodelite wxshapeframework databaselayersqlite)
add_dependencies(plugin libcodelite)
if(NOT SDK_ONLY)
--- a/CodeLite/CMakeLists.txt
+++ b/CodeLite/CMakeLists.txt
@@ -122,7 +122,7 @@
${wxWidgets_LIBRARIES}
-L"${CL_LIBPATH}"
${SQLite3_LIBRARIES}
- wxsqlite3
+ -lwxsqlite3-3.2
${LIBSSH_LIB}
${GTK_LIBS}
${ADDITIONAL_LIBRARIES}
--- a/wxcrafter/CMakeLists.txt
+++ b/wxcrafter/CMakeLists.txt
@@ -125,7 +125,7 @@
${PLUGIN_NAME}
${LINKER_OPTIONS}
${wxWidgets_LIBRARIES}
- wxsqlite3
+ -lwxsqlite3-3.2
${SQLite3_LIBRARIES}
libcodelite
plugin)
|
