~feng-kylin/unity8/fix-lp1413791

« back to all changes in this revision

Viewing changes to CMakeLists.txt

Committer: Mirco Müller
Date: 2015-04-15 11:37:00 UTC
mfrom: (1595.112.13 shellRotation)
mto: (1595.1.210 unity8)
mto: This revision was merged to the branch mainline in revision 1608.
Revision ID: mirco.mueller@ubuntu.com-20150415113700-rbhhinq6o7tj987l

Merged with unity-team's shellRotation branch and fixed conflicts.

files added:
data/indicators-client.desktop.in

data/unity-mock-indicator-service.conf

plugins/Utils/constants.cpp

plugins/Utils/constants.h

plugins/Utils/inputwatcher.cpp

plugins/Utils/inputwatcher.h

po/sk.po

tests/autopilot/unity8/greeter

tests/autopilot/unity8/greeter/__init__.py

tests/autopilot/unity8/greeter/tests

tests/autopilot/unity8/greeter/tests/__init__.py

tests/autopilot/unity8/greeter/tests/test_args.py

tests/autopilot/unity8/indicators/tests/test_action_latency.py

tests/mocks/Unity/Application/MirSurfaceItem.cpp

tests/mocks/Unity/Application/MirSurfaceItem.h

tests/mocks/data/unity

tests/mocks/data/unity/indicators

tests/mocks/data/unity/indicators/com.canonical.indicator.mock

tests/mocks/indicator-service

tests/mocks/indicator-service/CMakeLists.txt

tests/mocks/indicator-service/mock-indicator-service.c

files removed:
tests/mocks/Unity/Application/MirSurfaceItem.cpp

tests/mocks/Unity/Application/MirSurfaceItem.h

files modified:
CMakeLists.txt

CODING

data/CMakeLists.txt

debian/changelog

debian/control

debian/indicators-client.install

debian/unity8-autopilot.install

include/paths.h.in

plugins/Greeter/Unity/Launcher/CMakeLists.txt

plugins/ScreenGrabber/screengrabber.cpp

plugins/Ubuntu/Gestures/TouchGate.cpp

plugins/Ubuntu/Gestures/TouchGate.h

plugins/Unity/Launcher/launchermodel.cpp

plugins/Utils/CMakeLists.txt

plugins/Utils/plugin.cpp

po/bg.po

po/en_AU.po

po/fa.po

po/sr.po

qml/Components/Dialogs.qml

qml/Dash/Dash.qml

qml/Dash/DashContent.qml

qml/Dash/GenericScopeView.qml

qml/Panel/Indicators/MenuItemFactory.qml

qml/Panel/Indicators/client/IndicatorsList.qml

qml/Panel/IndicatorsMenu.qml

qml/Panel/Panel.qml

qml/Shell.qml

qml/Stages/SurfaceContainer.qml

qml/Tutorial/Tutorial.qml

qml/Tutorial/TutorialContent.qml

run.sh

src/Panel/Indicators/client/CMakeLists.txt

src/UnityCommandLineParser.cpp

src/UnityCommandLineParser.h

src/main.cpp

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py

tests/autopilot/unity8/fixture_setup.py

tests/autopilot/unity8/indicators/__init__.py

tests/autopilot/unity8/indicators/tests/__init__.py

tests/autopilot/unity8/indicators/tests/test_display_indicator.py

tests/autopilot/unity8/indicators/tests/test_indicators.py

tests/autopilot/unity8/process_helpers.py

tests/autopilot/unity8/shell/tests/__init__.py

tests/autopilot/unity8/shell/tests/test_lock_screen.py

tests/mocks/CMakeLists.txt

tests/mocks/GSettings.1.0/fake_gsettings.cpp

tests/mocks/GSettings.1.0/fake_gsettings.h

tests/mocks/GSettings.1.0/plugin.cpp

tests/mocks/Unity/Application/CMakeLists.txt

tests/mocks/Unity/fake_scope.cpp

tests/mocks/Unity/fake_scope.h

tests/plugins/Unity/Indicators/indicatorsmanagertest.cpp

tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp

tests/plugins/Unity/Launcher/CMakeLists.txt

tests/plugins/Unity/Launcher/launchermodeltest.cpp

tests/qmltests/Components/tst_Dialogs.qml

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Dash/tst_GenericScopeView.qml

tests/qmltests/Dash/tst_PreviewListView.qml

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml

tests/qmltests/Panel/tst_Panel.qml

tests/qmltests/Stages/tst_SurfaceContainer.qml

tests/qmltests/Tutorial/tst_Tutorial.qml

tests/qmltests/tst_Shell.qml

tests/utils/modules/Unity/Test/UnityTestCase.qml

Show diffs side-by-side

added added

removed removed

CMakeLists.txt

find_package(Qt5Concurrent 5.2 REQUIRED)

find_package(Qt5Sql 5.2 REQUIRED)

pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)

# Standard install paths

include(GNUInstallDirs)

105

107

set(SHELL_APP unity8)

106

108

set(DASH_APP unity8-dash)

107

109

set(SCOPE_TOOL unity-scope-tool)

110

set(INDICATORS_CLIENT_APP indicators-client)

111

set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)

108

112

109

113

include_directories(

110

114

${CMAKE_SOURCE_DIR}/include

Older »