git.iko.soy/unity8
on xenial help sign in
Actually fix the underlying issue
90fc81bJosh Arenson
plugins/LightDM/FullLightDM/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -8,7 +8,7 @@ configure_file(../qmldir.in ${CMAKE_CURRENT_SOURCE_DIR}/qmldir)
8add_definitions(-DFULL_LIGHTDM)
8add_definitions(-DFULL_LIGHTDM)
9
9
10include_directories(
10include_directories(
11− ${QMLPLUGIN_INCLUDES}
11+ ${LIBLIGHTDM_INCLUDE_DIRS}
12 ${CMAKE_CURRENT_BINARY_DIR}
12 ${CMAKE_CURRENT_BINARY_DIR}
13)
13)
14
14
plugins/LightDM/IntegratedLightDM/CMakeLists.txt+2−7
@@ -5,15 +5,10 @@ configure_file(../qmldir.in ${CMAKE_CURRENT_SOURCE_DIR}/qmldir)
5
5
6add_definitions(-DINTEGRATED_LIGHTDM)
6add_definitions(-DINTEGRATED_LIGHTDM)
7
7
8−foreach(include_directory ${QMLPLUGIN_INCLUDES})
9− list(APPEND RELATIVE_QMLPLUGIN_INCLUDES ../${include_directory})
10−endforeach()
11−
12include_directories(
8include_directories(
13− ${QMLPLUGIN_INCLUDES}
14 ${libunity8-private_SOURCE_DIR}
9 ${libunity8-private_SOURCE_DIR}
15− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
10+ ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
16− ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
11+ ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
17)
12)
18
13
19foreach(source_file ${QMLPLUGIN_SRC})
14foreach(source_file ${QMLPLUGIN_SRC})