on xenial help sign in
Fix include order causing lib symbol issues
23b47f9Josh Arenson
plugins/LightDM/CMakeLists.txt−2
@@ -7,8 +7,6 @@ include_directories(
7 ${CMAKE_CURRENT_SOURCE_DIR}
7 ${CMAKE_CURRENT_SOURCE_DIR}
8 ${CMAKE_CURRENT_BINARY_DIR}
8 ${CMAKE_CURRENT_BINARY_DIR}
9 ${CMAKE_SOURCE_DIR}/plugins/Utils
9 ${CMAKE_SOURCE_DIR}/plugins/Utils
10− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
11− ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
12 ${LIBLIGHTDM_INCLUDE_DIRS}
10 ${LIBLIGHTDM_INCLUDE_DIRS}
13 ${libunity8-private_SOURCE_DIR}
11 ${libunity8-private_SOURCE_DIR}
14 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
12 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
plugins/LightDM/FullLightDM/CMakeLists.txt+4−1
@@ -7,7 +7,10 @@ configure_file(../qmldir.in ${CMAKE_CURRENT_SOURCE_DIR}/qmldir)
7
7
8add_definitions(-DFULL_LIGHTDM)
8add_definitions(-DFULL_LIGHTDM)
9
9
10−include_directories(../)
10+include_directories(
11+ ../
12+ ${CMAKE_CURRENT_BINARY_DIR}
13+)
11
14
12foreach(source_file ${QMLPLUGIN_SRC})
15foreach(source_file ${QMLPLUGIN_SRC})
13 list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
16 list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
plugins/LightDM/IntegratedLightDM/CMakeLists.txt+2
@@ -12,6 +12,8 @@ endforeach()
12include_directories(
12include_directories(
13 ${QMLPLUGIN_INCLUDES}
13 ${QMLPLUGIN_INCLUDES}
14 ${libunity8-private_SOURCE_DIR}
14 ${libunity8-private_SOURCE_DIR}
15+ ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
16+ ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
15)
17)
16
18
17foreach(source_file ${QMLPLUGIN_SRC})
19foreach(source_file ${QMLPLUGIN_SRC})