d1e7f02 · unity8 · git.iko.soy

plugins/LightDM/CMakeLists.txt−2

compare with xenial

unifiedsplit

@@ -1,5 +1,4 @@

1pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

2−pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)

3

2

4find_package(Qt5Core REQUIRED)

3find_package(Qt5Core REQUIRED)

5find_package(Qt5Quick REQUIRED)

4find_package(Qt5Quick REQUIRED)

@@ -9,7 +8,6 @@ include_directories(

9 ${CMAKE_CURRENT_BINARY_DIR}

8 ${CMAKE_CURRENT_BINARY_DIR}

10 ${CMAKE_SOURCE_DIR}/plugins/Utils

9 ${CMAKE_SOURCE_DIR}/plugins/Utils

11 ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM

10 ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM

12− ${LIBLIGHTDM_INCLUDE_DIRS}

13 ${libunity8-private_SOURCE_DIR}

11 ${libunity8-private_SOURCE_DIR}

14 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

12 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

15)

13)

plugins/LightDM/FullLightDM/CMakeLists.txt+4−1

@@ -4,7 +4,10 @@ set(PLUGIN_CLASSNAME "FullLightDM")

4

5add_definitions(-DFULL_LIGHTDM)

6

7−include_directories(../)

7+include_directories(

8+ ../

9+ ${LIBLIGHTDM_INCLUDE_DIRS}

10+ )

8

11

9foreach(source_file ${QMLPLUGIN_SRC})

12foreach(source_file ${QMLPLUGIN_SRC})

10 list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})

13 list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})

plugins/LightDM/IntegratedLightDM/CMakeLists.txt+2−2

@@ -8,8 +8,8 @@ endforeach()

8

9include_directories(

10 ../

11− ${libunity8-private_SOURCE_DIR}

11+ ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM

12−)

12+ )

13

14foreach(source_file ${QMLPLUGIN_SRC})

15 list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})