git.iko.soy/unity8
on xenial help sign in
Fix broken merge
95b42f5Michael Terry
plugins/Ubuntu/Gestures/CMakeLists.txt−5
compare with xenial
unifiedsplit
@@ -16,13 +16,8 @@ pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)
16
16
17add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
17add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
18
18
19−<<<<<<< TREE
20add_library(UbuntuGesturesQml SHARED ${UbuntuGesturesQml_SOURCES})
19add_library(UbuntuGesturesQml SHARED ${UbuntuGesturesQml_SOURCES})
21−target_link_libraries(UbuntuGesturesQml UbuntuGestures)
22−=======
23−add_library(UbuntuGesturesQml MODULE ${UbuntuGesturesQml_SOURCES})
24target_link_libraries(UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})
20target_link_libraries(UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})
25−>>>>>>> MERGE-SOURCE
26
21
27qt5_use_modules(UbuntuGesturesQml Core Quick)
22qt5_use_modules(UbuntuGesturesQml Core Quick)
28
23