Git commit 52b1f34d86922b5692c77567d606f9dad1b38547 by Albert Astals Cid. Committed on 16/11/2012 at 13:51. Pushed by aacid into branch 'master'.
Add qjson_ variants in addition to QJSON_ ones It is a sad world in which we live in and we ship a FindQJSon.cmake that defines QJSON_ but it seems that some debian derived distros are including a qjson-config.cmake that is not in 0.7.1 upstream (latest released version) and that defines the qjson_ ones, so i guess we need both for people using the qjson-config.cmake and for people using the FindQJSon.cmake Buildsystem guys, is there a better solution? CCMAIL: [email protected] M +2 -2 runners/youtube/CMakeLists.txt http://commits.kde.org/kdeplasma-addons/52b1f34d86922b5692c77567d606f9dad1b38547 diff --git a/runners/youtube/CMakeLists.txt b/runners/youtube/CMakeLists.txt index ac5e71c..639d403 100644 --- a/runners/youtube/CMakeLists.txt +++ b/runners/youtube/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${QJSON_INCLUDE_DIR}) +include_directories(${QJSON_INCLUDE_DIR} ${qjson_INCLUDE_DIR}) set(krunner_youtube_SRCS imageiconengine.cpp @@ -9,7 +9,7 @@ set(krunner_youtube_SRCS add_subdirectory(icons) kde4_add_plugin(krunner_youtube ${krunner_youtube_SRCS}) -target_link_libraries(krunner_youtube ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${QJSON_LIBRARIES}) +target_link_libraries(krunner_youtube ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${QJSON_LIBRARIES} ${qjson_LIBRARIES}) install(TARGETS krunner_youtube DESTINATION ${PLUGIN_INSTALL_DIR} ) _______________________________________________ Kde-buildsystem mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-buildsystem
