git.iko.soy/unity8
on xenial help sign in
Actually fix the underlying issue
commit90fc81b68af511f4f5c1fd791b350b814dd946f9 authorJosh Arenson <joshua.arenson@canonical.com> dateThu 10 Dec 2015, 16:10 (11 years ago) parentf5a7295
2 files changed+3−8
compare with xenial
unifiedsplit
plugins/LightDM/FullLightDM/CMakeLists.txt+1−1 plugins/LightDM/IntegratedLightDM/CMakeLists.txt+2−7
plugins/LightDM/FullLightDM/CMakeLists.txt+1−1
@@ -8,7 +8,7 @@ configure_file(../qmldir.in ${CMAKE_CURRENT_SOURCE_DIR}/qmldir)
88add_definitions(-DFULL_LIGHTDM)
99
1010include_directories(
11− ${QMLPLUGIN_INCLUDES}
11+ ${LIBLIGHTDM_INCLUDE_DIRS}
1212 ${CMAKE_CURRENT_BINARY_DIR}
1313)
1414
plugins/LightDM/IntegratedLightDM/CMakeLists.txt+2−7
@@ -5,15 +5,10 @@ configure_file(../qmldir.in ${CMAKE_CURRENT_SOURCE_DIR}/qmldir)
55
66add_definitions(-DINTEGRATED_LIGHTDM)
77
8−foreach(include_directory ${QMLPLUGIN_INCLUDES})
9− list(APPEND RELATIVE_QMLPLUGIN_INCLUDES ../${include_directory})
10−endforeach()
11−
128include_directories(
13− ${QMLPLUGIN_INCLUDES}
149 ${libunity8-private_SOURCE_DIR}
15− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
16− ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
10+ ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
11+ ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
1712)
1813
1914foreach(source_file ${QMLPLUGIN_SRC})