git.iko.soy/unity8
on xenial help sign in
only check once for launcher
5d5dd23Michael Zanetti
CMakeLists.txt+2−2
compare with xenial
unifiedsplit
@@ -93,8 +93,6 @@ enable_testing()
93include(autopilot)
93include(autopilot)
94declare_autopilot_test(unity8 ${CMAKE_SOURCE_DIR}/tests/autopilot/)
94declare_autopilot_test(unity8 ${CMAKE_SOURCE_DIR}/tests/autopilot/)
95
95
96−add_subdirectory(tests)
97−
98set(SHELL_APP unity8)
96set(SHELL_APP unity8)
99
97
100set(shell_app_HDRS
98set(shell_app_HDRS
@@ -108,6 +106,7 @@ add_executable(${SHELL_APP}
108
106
109qt5_use_modules(${SHELL_APP} Qml Quick Test)
107qt5_use_modules(${SHELL_APP} Qml Quick Test)
110pkg_check_modules(XCB REQUIRED xcb)
108pkg_check_modules(XCB REQUIRED xcb)
109+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)
111
110
112if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
111if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
113 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
112 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
@@ -132,6 +131,7 @@ install(FILES ${QML_JS_FILES}
132 )
131 )
133
132
134# add subdirectories to build
133# add subdirectories to build
134+add_subdirectory(tests)
135add_subdirectory(plugins)
135add_subdirectory(plugins)
136
136
137# install subdirectories
137# 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−
5include_directories(
1include_directories(
6 ${CMAKE_CURRENT_SOURCE_DIR}
2 ${CMAKE_CURRENT_SOURCE_DIR}
7)
3)
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−
9include_directories(
1include_directories(
10 ${CMAKE_CURRENT_SOURCE_DIR}
2 ${CMAKE_CURRENT_SOURCE_DIR}
11)
3)