git.iko.soy/unity8
on xenial help sign in
only check once for launcher
commit5d5dd230fd1a43390c1b11cdb373041b890e065e authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 10 Jul 2013, 17:43 (13 years ago) parent04475cb
3 files changed+2−14
compare with xenial
unifiedsplit
CMakeLists.txt+2−2 plugins/Unity/Launcher/CMakeLists.txt−4 tests/mocks/Unity/Launcher/CMakeLists.txt−8
CMakeLists.txt+2−2
@@ -93,8 +93,6 @@ enable_testing()
9393include(autopilot)
9494declare_autopilot_test(unity8 ${CMAKE_SOURCE_DIR}/tests/autopilot/)
9595
96−add_subdirectory(tests)
97−
9896set(SHELL_APP unity8)
9997
10098set(shell_app_HDRS
@@ -108,6 +106,7 @@ add_executable(${SHELL_APP}
108106
109107qt5_use_modules(${SHELL_APP} Qml Quick Test)
110108pkg_check_modules(XCB REQUIRED xcb)
109+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)
111110
112111if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
113112 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
@@ -132,6 +131,7 @@ install(FILES ${QML_JS_FILES}
132131 )
133132
134133# add subdirectories to build
134+add_subdirectory(tests)
135135add_subdirectory(plugins)
136136
137137# install subdirectories
plugins/Unity/Launcher/CMakeLists.txt−4
@@ -1,7 +1,3 @@
1−# Dependencies
2−include(FindPkgConfig)
3−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)
4−
51include_directories(
62 ${CMAKE_CURRENT_SOURCE_DIR}
73)
tests/mocks/Unity/Launcher/CMakeLists.txt−8
@@ -1,11 +1,3 @@
1−set(CMAKE_AUTOMOC ON)
2−
3−include(FindPkgConfig)
4−find_package(Qt5Core REQUIRED)
5−find_package(Qt5Quick REQUIRED)
6−
7−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher)
8−
91include_directories(
102 ${CMAKE_CURRENT_SOURCE_DIR}
113)