Fix include order causing lib symbol issues
commit23b47f9dbdc2b21fb751db6e58e55e3e7d56018c
authorJosh Arenson <joshua.arenson@canonical.com>
dateThu 10 Dec 2015, 12:31 (11 years ago)
parenta02fc3b
plugins/LightDM/CMakeLists.txt−2
@@ -7,8 +7,6 @@ include_directories(
77 ${CMAKE_CURRENT_SOURCE_DIR}
88 ${CMAKE_CURRENT_BINARY_DIR}
99 ${CMAKE_SOURCE_DIR}/plugins/Utils
10− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
11− ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
1210 ${LIBLIGHTDM_INCLUDE_DIRS}
1311 ${libunity8-private_SOURCE_DIR}
1412 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
plugins/LightDM/FullLightDM/CMakeLists.txt+4−1
@@ -7,7 +7,10 @@ configure_file(../qmldir.in ${CMAKE_CURRENT_SOURCE_DIR}/qmldir)
77
88add_definitions(-DFULL_LIGHTDM)
99
10−include_directories(../)
10+include_directories(
11+ ../
12+ ${CMAKE_CURRENT_BINARY_DIR}
13+)
1114
1215foreach(source_file ${QMLPLUGIN_SRC})
1316 list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
plugins/LightDM/IntegratedLightDM/CMakeLists.txt+2
@@ -12,6 +12,8 @@ endforeach()
1212include_directories(
1313 ${QMLPLUGIN_INCLUDES}
1414 ${libunity8-private_SOURCE_DIR}
15+ ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
16+ ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
1517)
1618
1719foreach(source_file ${QMLPLUGIN_SRC})