git.iko.soy/unity8
on xenial help sign in
Cleanup some more lightdm stuff
commitd1e7f022b234043685d3928fb0cd97760b98b31d authorJosh Arenson <joshua.arenson@canonical.com> dateTue 1 Mar 2016, 18:54 (11 years ago) parent64f4549
3 files changed+6−5
compare with xenial
unifiedsplit
plugins/LightDM/CMakeLists.txt−2 plugins/LightDM/FullLightDM/CMakeLists.txt+4−1 plugins/LightDM/IntegratedLightDM/CMakeLists.txt+2−2
plugins/LightDM/CMakeLists.txt−2
@@ -1,5 +1,4 @@
11pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
2−pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
32
43find_package(Qt5Core REQUIRED)
54find_package(Qt5Quick REQUIRED)
@@ -9,7 +8,6 @@ include_directories(
98 ${CMAKE_CURRENT_BINARY_DIR}
109 ${CMAKE_SOURCE_DIR}/plugins/Utils
1110 ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
12− ${LIBLIGHTDM_INCLUDE_DIRS}
1311 ${libunity8-private_SOURCE_DIR}
1412 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
1513)
plugins/LightDM/FullLightDM/CMakeLists.txt+4−1
@@ -4,7 +4,10 @@ set(PLUGIN_CLASSNAME "FullLightDM")
44
55add_definitions(-DFULL_LIGHTDM)
66
7−include_directories(../)
7+include_directories(
8+ ../
9+ ${LIBLIGHTDM_INCLUDE_DIRS}
10+ )
811
912foreach(source_file ${QMLPLUGIN_SRC})
1013 list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
plugins/LightDM/IntegratedLightDM/CMakeLists.txt+2−2
@@ -8,8 +8,8 @@ endforeach()
88
99include_directories(
1010 ../
11− ${libunity8-private_SOURCE_DIR}
12−)
11+ ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
12+ )
1313
1414foreach(source_file ${QMLPLUGIN_SRC})
1515 list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})