1 |
jlec 14/09/28 14:57:30 |
2 |
|
3 |
Added: sqlitebrowser-3.3.1-unbundle.patch |
4 |
Log: |
5 |
dev-db/sqlitebrowser: Version BUmp, #516662 |
6 |
|
7 |
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/files/sqlitebrowser-3.3.1-unbundle.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: sqlitebrowser-3.3.1-unbundle.patch |
16 |
=================================================================== |
17 |
CMakeLists.txt | 12 ++---------- |
18 |
1 file changed, 2 insertions(+), 10 deletions(-) |
19 |
|
20 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
21 |
index 68f049e..474e613 100644 |
22 |
--- a/CMakeLists.txt |
23 |
+++ b/CMakeLists.txt |
24 |
@@ -7,13 +7,9 @@ if(NOT CMAKE_BUILD_TYPE) |
25 |
set(CMAKE_BUILD_TYPE "Release") |
26 |
endif() |
27 |
|
28 |
-set(ANTLR_DIR libs/antlr-2.7.7) |
29 |
set(QHEXEDIT_DIR libs/qhexedit) |
30 |
-set(QCUSTOMPLOT_DIR libs/qcustomplot-source) |
31 |
|
32 |
-add_subdirectory(${ANTLR_DIR}) |
33 |
add_subdirectory(${QHEXEDIT_DIR}) |
34 |
-add_subdirectory(${QCUSTOMPLOT_DIR}) |
35 |
|
36 |
if(USE_QT5) |
37 |
find_package(Qt5Widgets REQUIRED) |
38 |
@@ -165,9 +161,7 @@ endif(APPLE) |
39 |
|
40 |
include_directories( |
41 |
"${CMAKE_CURRENT_BINARY_DIR}" |
42 |
- ${ANTLR_DIR} |
43 |
${QHEXEDIT_DIR} |
44 |
- ${QCUSTOMPLOT_DIR} |
45 |
${ADDITIONAL_INCLUDE_PATHS} |
46 |
src) |
47 |
|
48 |
@@ -183,12 +177,10 @@ if(USE_QT5) |
49 |
qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport) |
50 |
set(QT_LIBRARIES "") |
51 |
endif() |
52 |
-add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot) |
53 |
+add_dependencies(${PROJECT_NAME} qhexedit) |
54 |
|
55 |
link_directories( |
56 |
- "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}" |
57 |
- "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}" |
58 |
- "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}") |
59 |
+ "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}") |
60 |
|
61 |
target_link_libraries(${PROJECT_NAME} |
62 |
antlr |