]>
Commit | Line | Data |
---|---|---|
3d5dde55 JR |
1 | --- tellico-2.3.8/CMakeLists.txt~ 2013-07-08 05:42:53.000000000 +0200 |
2 | +++ tellico-2.3.8/CMakeLists.txt 2013-11-08 19:07:20.205665333 +0100 | |
3 | @@ -55,8 +55,8 @@ | |
4 | include_directories(${KDEPIMLIBS_INCLUDE_DIRS}) | |
5 | endif(KDEPIMLIBS_FOUND) | |
6 | ||
7 | -macro_optional_find_package(KdeMultimedia) | |
8 | -macro_log_feature(KDEMULTIMEDIA_FOUND "kdemultimedia" "Support for CDDB searches" "http://multimedia.kde.org" FALSE "4.2.0" "") | |
9 | +macro_optional_find_package(Libkcddb) | |
10 | +macro_log_feature(LIBKCDDB_LIBRARIES "libkcddb" "Support for CDDB searches" "http://multimedia.kde.org" FALSE "4.2.0" "") | |
11 | ||
12 | # The taglib cmake script is broken for older taglib versions, this works around the issue | |
13 | set(TAGLIB_INCLUDES) | |
14 | @@ -169,7 +169,7 @@ | |
15 | macro_bool_to_01(LIBEXEMPI_FOUND HAVE_EXEMPI) | |
16 | macro_bool_to_01(YAZ_FOUND HAVE_YAZ) | |
17 | macro_bool_to_01(KSANE_FOUND HAVE_KSANE) | |
18 | -macro_bool_to_01(KDEMULTIMEDIA_FOUND HAVE_KCDDB) | |
19 | +macro_bool_to_01(LIBKCDDB_LIBRARIES HAVE_KCDDB) | |
20 | macro_bool_to_01(KDEPIMLIBS_FOUND HAVE_KABC) | |
21 | macro_bool_to_01(KDEPIMLIBS_FOUND HAVE_KCAL) | |
22 | macro_bool_to_01(KDEPIMLIBS_FOUND HAVE_KXMLRPC) | |
23 | --- tellico-2.3.8/src/CMakeLists.txt~ 2013-07-08 05:38:42.000000000 +0200 | |
24 | +++ tellico-2.3.8/src/CMakeLists.txt 2013-11-08 19:31:46.275654720 +0100 | |
25 | @@ -107,9 +107,9 @@ | |
26 | TARGET_LINK_LIBRARIES(tellico ${KDEPIMLIBS_KABC_LIBS} ${KDEPIMLIBS_KCAL_LIBS}) | |
27 | ENDIF( KDEPIMLIBS_FOUND ) | |
28 | ||
29 | -IF( KDEMULTIMEDIA_FOUND ) | |
30 | - TARGET_LINK_LIBRARIES(tellico ${KCDDB_LIBRARY}) | |
31 | -ENDIF( KDEMULTIMEDIA_FOUND) | |
32 | +IF( LIBKCDDB_LIBRARIES ) | |
33 | + TARGET_LINK_LIBRARIES(tellico ${LIBKCDDB_LIBRARIES}) | |
34 | +ENDIF( LIBKCDDB_LIBRARIES ) | |
35 | ||
36 | IF( POPPLER_QT4_FOUND ) | |
37 | TARGET_LINK_LIBRARIES(tellico ${POPPLER_QT4_LIBRARIES}) |