on xenial help sign in
use proper cmake find for libunity-api
commitcdbe6169ab3dd4c6612ec6fe983c65595679050b authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 2 Jul 2013, 14:53 (13 years ago) parent8237bc2
2 files changed+6−7
plugins/Unity/CMakeLists.txt−1 plugins/Unity/Launcher/CMakeLists.txt+6−6
plugins/Unity/CMakeLists.txt−1
@@ -49,4 +49,3 @@ install(FILES qmldir
4949
5050
5151add_subdirectory(Launcher)
52−
plugins/Unity/Launcher/CMakeLists.txt+6−6
@@ -1,21 +1,21 @@
11# Dependencies
22include(FindPkgConfig)
3−
4−#TODO: remove this once unity-api is released to distro
5−set(UNITY_API_DIR /home/mzanetti/Development/unity-api/include/)
3+pkg_check_modules(LIBUNITY_API REQUIRED libunity-api)
64
75include_directories(
86 ${CMAKE_CURRENT_SOURCE_DIR}
97 ${CMAKE_CURRENT_BINARY_DIR}
10− ${UNITY_API_DIR}
8+ ${LIBUNITY_API_INCLUDEDIR}
119)
1210
11+message(found ${LIBUNITY_API_INCLUDEDIR})
12+
1313set(QMLLAUNCHERPLUGIN_SRC
1414 plugin.cpp
1515 launchermodel.cpp
1616 launcheritem.cpp
17− ${UNITY_API_DIR}/unity/shell/launcher/LauncherItemInterface.h
18− ${UNITY_API_DIR}/unity/shell/launcher/LauncherModelInterface.h
17+ ${LIBUNITY_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
18+ ${LIBUNITY_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
1919 )
2020
2121add_library(UnityLauncher-qml MODULE