git.iko.soy/unity8
on xenial help sign in
Remove unneeded stuff from CMakelists.txt
4bf9816Albert Astals
CMakeLists.txt+1
compare with xenial
unifiedsplit
@@ -48,6 +48,7 @@ add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2
48 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
48 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
49
49
50include(FindPkgConfig)
50include(FindPkgConfig)
51+find_package(Qt5Core)
51find_package(Qt5Qml)
52find_package(Qt5Qml)
52find_package(Qt5Quick)
53find_package(Qt5Quick)
53find_package(Qt5Gui)
54find_package(Qt5Gui)
plugins/Ubuntu/Gestures/CMakeLists.txt−6
@@ -1,12 +1,6 @@
1# export_qmlplugin macro
1# export_qmlplugin macro
2include(Plugins)
2include(Plugins)
3
3
4−set(CMAKE_AUTOMOC ON)
5−
6−include(FindPkgConfig)
7−find_package(Qt5Core REQUIRED)
8−find_package(Qt5Quick REQUIRED)
9−
10set(UbuntuGestureQml_SOURCES
4set(UbuntuGestureQml_SOURCES
11 plugin.cpp
5 plugin.cpp
12 AxisVelocityCalculator.cpp
6 AxisVelocityCalculator.cpp
tests/mocks/HudClient/CMakeLists.txt−5
@@ -1,8 +1,3 @@
1−set(CMAKE_AUTOMOC ON)
2−
3−include(FindPkgConfig)
4−find_package(Qt5Core REQUIRED)
5−find_package(Qt5Quick REQUIRED)
6pkg_search_module(DEE dee-1.0 REQUIRED)
1pkg_search_module(DEE dee-1.0 REQUIRED)
7pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
2pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
8pkg_search_module(HUDCLIENT hud-client-2 REQUIRED)
3pkg_search_module(HUDCLIENT hud-client-2 REQUIRED)
tests/mocks/Ubuntu/Application/CMakeLists.txt−6
@@ -1,9 +1,3 @@
1−set(CMAKE_AUTOMOC ON)
2−
3−include(FindPkgConfig)
4−find_package(Qt5Core REQUIRED)
5−find_package(Qt5Quick REQUIRED)
6−
7set(FakeUbuntuApplicationQml_SOURCES
1set(FakeUbuntuApplicationQml_SOURCES
8 plugin.cpp
2 plugin.cpp
9 ApplicationInfo.cpp
3 ApplicationInfo.cpp
tests/mocks/Unity/CMakeLists.txt−5
@@ -1,10 +1,5 @@
1−set(CMAKE_AUTOMOC ON)
2−
3add_subdirectory(Indicators)
1add_subdirectory(Indicators)
4
2
5−include(FindPkgConfig)
6−find_package(Qt5Core REQUIRED)
7−find_package(Qt5Quick REQUIRED)
8pkg_search_module(DEE dee-1.0 REQUIRED)
3pkg_search_module(DEE dee-1.0 REQUIRED)
9pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
4pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
10pkg_search_module(DEEQT libdee-qt5 REQUIRED)
5pkg_search_module(DEEQT libdee-qt5 REQUIRED)
tests/utils/modules/Unity/Test/CMakeLists.txt−4
@@ -1,7 +1,3 @@
1−find_package(Qt5Core REQUIRED)
2−find_package(Qt5Quick REQUIRED)
3−
4−set(CMAKE_AUTOMOC ON)
5add_definitions(-DQT_NO_KEYWORDS)
1add_definitions(-DQT_NO_KEYWORDS)
6
2
7set(UnityTestQML_SOURCES
3set(UnityTestQML_SOURCES