Fix broken merge
commit95b42f5fa92dd9a2430fc2b45cee2400cfef5ba8
authorMichael Terry <michael.terry@canonical.com>
dateThu 2 Jun 2016, 10:46 (10 years ago)
parent936045a
plugins/Ubuntu/Gestures/CMakeLists.txt−5
@@ -16,13 +16,8 @@ pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)
1616
1717add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
1818
19−<<<<<<< TREE
2019add_library(UbuntuGesturesQml SHARED ${UbuntuGesturesQml_SOURCES})
21−target_link_libraries(UbuntuGesturesQml UbuntuGestures)
22−=======
23−add_library(UbuntuGesturesQml MODULE ${UbuntuGesturesQml_SOURCES})
2420target_link_libraries(UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})
25−>>>>>>> MERGE-SOURCE
2621
2722qt5_use_modules(UbuntuGesturesQml Core Quick)
2823