]> git.pld-linux.org Git - packages/clementine.git/blame - clementine-dont-bundle-external-lib.patch
- clementine has problems with stripped libqsqlite.so add bcond to build with static...
[packages/clementine.git] / clementine-dont-bundle-external-lib.patch
CommitLineData
f2d911f2
ER
1--- clementine-0.4.2/CMakeLists.txt~ 2010-07-01 21:18:22.000000000 +0300
2+++ clementine-0.4.2/CMakeLists.txt 2010-07-07 09:03:25.664272595 +0300
3@@ -149,12 +149,7 @@
4 endif(STATIC_SQLITE)
d25d376f
ER
5
6 # Subdirectories
7-add_subdirectory(3rdparty/qtsingleapplication)
f2d911f2 8-add_subdirectory(3rdparty/qtiocompressor)
d25d376f 9 add_subdirectory(src)
f2d911f2
ER
10-if (NOT APPLE)
11- add_subdirectory(3rdparty/qxt)
12-endif (NOT APPLE)
13 add_subdirectory(3rdparty/universalchardet)
d25d376f 14 add_subdirectory(tests)
f2d911f2
ER
15 add_subdirectory(dist)
16--- clementine-0.4.2/src/CMakeLists.txt~ 2010-07-01 21:17:36.000000000 +0300
17+++ clementine-0.4.2/src/CMakeLists.txt 2010-07-07 08:33:17.521870705 +0300
18@@ -5,10 +5,9 @@
d25d376f
ER
19
20 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
f2d911f2
ER
21 include_directories(${SPARKLE})
22-include_directories(../3rdparty/gmock/gtest/include)
23-include_directories(../3rdparty/qtsingleapplication)
24-include_directories(../3rdparty/qtiocompressor)
25-include_directories(../3rdparty/qxt)
26+include_directories("/usr/include/QtSolutions")
27+include_directories("/usr/include/QxtGui")
28+include_directories("/usr/include/QxtCore")
29 include_directories(../3rdparty/libprojectm)
30
31 include_directories(${GLIB_INCLUDE_DIRECTORIES})
32@@ -449,8 +448,8 @@
33 add_dependencies(clementine_lib pot)
d25d376f 34
d25d376f 35 target_link_libraries(clementine_lib
f2d911f2
ER
36- qtsingleapplication
37- qtiocompressor
38+ QtSolutions_SingleApplication-2.6
39+ QtSolutions_IOCompressor-2.3
40 chardet
41 ${GOBJECT_LIBRARIES}
42 ${GLIB_LIBRARIES}
43@@ -475,7 +474,7 @@
d25d376f 44 )
f2d911f2
ER
45 include_directories(${SPARKLE}/Headers)
46 else (APPLE)
47- target_link_libraries(clementine_lib qxt)
48+ target_link_libraries(clementine_lib QxtCore QxtGui)
d25d376f 49 endif (APPLE)
d25d376f 50
f2d911f2
ER
51 # Link against the qsqlite plugin on windows and mac
52@@ -484,7 +483,7 @@
53 target_link_libraries(clementine_lib qsqlite)
54 endif(HAVE_STATIC_SQLITE)
55
56-add_dependencies(clementine_lib qtsingleapplication)
57+add_dependencies(clementine_lib QtSolutions_SingleApplication-2.6)
58
59
60 ###############################################################################
This page took 0.235108 seconds and 4 git commands to generate.