| Index: src/CMakeLists.txt
|
| diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
| index 1b93e92cc8b993220ebe7e64e81852663643d014..4fe1450012ec4f9bf02f0faac5a339a82aff5095 100644
|
| --- a/src/CMakeLists.txt
|
| +++ b/src/CMakeLists.txt
|
| @@ -12,15 +12,18 @@ LINK_DIRECTORIES(${GTK2_LIBRARY_DIRS} ${IBUS_LIBRARY_DIRS}
|
| SET(GOB_GENERATED ${CMAKE_HOME_DIRECTORY}/src/ibus-chewing-engine.c
|
| ${CMAKE_HOME_DIRECTORY}/src/ibus-chewing-engine.h
|
| ${CMAKE_HOME_DIRECTORY}/src/ibus-chewing-engine-private.h
|
| - ${CMAKE_HOME_DIRECTORY}/src/maker-dialog.c
|
| - ${CMAKE_HOME_DIRECTORY}/src/maker-dialog.h
|
| - ${CMAKE_HOME_DIRECTORY}/src/maker-dialog-private.h
|
| + # Chromium change: Remove maker-dialog
|
| + #${CMAKE_HOME_DIRECTORY}/src/maker-dialog.c
|
| + #${CMAKE_HOME_DIRECTORY}/src/maker-dialog.h
|
| + #${CMAKE_HOME_DIRECTORY}/src/maker-dialog-private.h
|
| )
|
|
|
| ADD_CUSTOM_COMMAND(OUTPUT ${GOB_GENERATED}
|
| COMMAND ${GOB2} ${CMAKE_CURRENT_SOURCE_DIR}/IBusChewingEngine.gob -o ${CMAKE_CURRENT_SOURCE_DIR}
|
| - COMMAND ${GOB2} ${CMAKE_CURRENT_SOURCE_DIR}/MakerDialog.gob -o ${CMAKE_CURRENT_SOURCE_DIR}
|
| - DEPENDS IBusChewingEngine.gob MakerDialog.gob IBusChewingEngine-def.c
|
| + # Chromium change: Remove maker-dialog
|
| + #COMMAND ${GOB2} ${CMAKE_CURRENT_SOURCE_DIR}/MakerDialog.gob -o ${CMAKE_CURRENT_SOURCE_DIR}
|
| + #DEPENDS IBusChewingEngine.gob MakerDialog.gob IBusChewingEngine-def.c
|
| + DEPENDS IBusChewingEngine.gob IBusChewingEngine-def.c
|
| WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
| )
|
|
|
| @@ -36,7 +39,8 @@ SET_SOURCE_FILES_PROPERTIES(${GOB_GENERATED}
|
| # executable built from some source
|
| ADD_EXECUTABLE(ibus-engine-chewing main.c
|
| ibus-chewing-engine.c
|
| - maker-dialog.c
|
| + # Chromium change: Remove maker-dialog
|
| + #maker-dialog.c
|
| )
|
| #ADD_EXECUTABLE(generate-gconf-schemas
|
| # generate-gconf-schemas.c
|
| @@ -44,8 +48,11 @@ ADD_EXECUTABLE(ibus-engine-chewing main.c
|
| # )
|
|
|
| # Link the executable to the library.
|
| -TARGET_LINK_LIBRARIES(ibus-engine-chewing ${GTK2_LIBRARIES} ${IBUS_LIBRARIES}
|
| - ${CHEWING_LIBRARIES} ${GCONF2_LIBRARIES} ${XTST_LIBRARIES})
|
| +# Chromium change: Do not link GConf or GTK
|
| +#TARGET_LINK_LIBRARIES(ibus-engine-chewing ${GTK2_LIBRARIES} ${IBUS_LIBRARIES}
|
| +# ${CHEWING_LIBRARIES} ${GCONF2_LIBRARIES} ${XTST_LIBRARIES})
|
| +TARGET_LINK_LIBRARIES(ibus-engine-chewing ${IBUS_LIBRARIES}
|
| + ${CHEWING_LIBRARIES} ${XTST_LIBRARIES})
|
|
|
| #TARGET_LINK_LIBRARIES(generate-gconf-schemas ${GTK2_LIBRARIES})
|
|
|
|
|