@@ -69,17 +69,6 @@ if(SHELL_PLUGINDIR STREQUAL "")
6969 message(FATAL_ERROR "Could not determine plugin import dir.")
7070endif()
7171
72−configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)
73−
74−pkg_check_modules(UNITY-MIR REQUIRED unity-mir)
75−
76−include_directories(
77− ${CMAKE_CURRENT_BINARY_DIR}
78− ${CMAKE_CURRENT_SOURCE_DIR}
79− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
80− ${UNITY-MIR_INCLUDE_DIRS}
81− )
82−
8372set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
8473
8574set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
@@ -108,26 +97,16 @@ declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
10897
10998set(SHELL_APP unity8)
11099
111−add_executable(${SHELL_APP}
112− ApplicationArguments.h
113− main.cpp
114− MouseTouchAdaptor.cpp
115− )
116−
117−qt5_use_modules(${SHELL_APP} Qml Quick Test)
118−pkg_check_modules(XCB REQUIRED xcb)
119−
120−if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
121− set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
122−
123− target_link_libraries(${SHELL_APP} ${XCB_LDFLAGS})
124−endif()
125−
100+include_directories(
101+ ${CMAKE_SOURCE_DIR}/include
102+ ${CMAKE_BINARY_DIR}/include
103+)
126104
127−# install binaries
128−install(TARGETS ${SHELL_APP}
129− RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
130− )
105+# add subdirectories to build
106+add_subdirectory(include)
107+add_subdirectory(src)
108+add_subdirectory(tests)
109+add_subdirectory(plugins)
131110
132111# install top level qml and js files
133112file(GLOB QML_JS_FILES *.qml *.js)
@@ -136,11 +115,6 @@ install(FILES ${QML_JS_FILES}
136115 DESTINATION ${SHELL_APP_DIR}
137116 )
138117
139−# add subdirectories to build
140−add_subdirectory(tests)
141−add_subdirectory(plugins)
142−add_subdirectory(src)
143−
144118# install subdirectories
145119set(QML_DIRS
146120 Bottombar