Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: src/CMakeLists.txt

Issue 6538084: Remove dependency on get-text, gtk2 and gconf2 (Closed) Base URL: http://git.chromium.org/git/ibus-chewing.git@master
Patch Set: Code review fix Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/IBusChewingEngine.gob » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Location of library include files 1 # Location of library include files
2 INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS} ${IBUS_INCLUDE_DIRS} 2 INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS} ${IBUS_INCLUDE_DIRS}
3 ${CHEWING_INCLUDE_DIRS} ${GCONF2_INCLUDE_DIRS} ${XTST_INCLUDE_DIRS}) 3 ${CHEWING_INCLUDE_DIRS} ${GCONF2_INCLUDE_DIRS} ${XTST_INCLUDE_DIRS})
4 4
5 # Library location for the linker 5 # Library location for the linker
6 LINK_DIRECTORIES(${GTK2_LIBRARY_DIRS} ${IBUS_LIBRARY_DIRS} 6 LINK_DIRECTORIES(${GTK2_LIBRARY_DIRS} ${IBUS_LIBRARY_DIRS}
7 ${CHEWING_LIBRARY_DIRS} ${GCONF2_LIBRARY_DIRS} ${XTST_LIBRARY_DIRS}) 7 ${CHEWING_LIBRARY_DIRS} ${GCONF2_LIBRARY_DIRS} ${XTST_LIBRARY_DIRS})
8 8
9 #================================================================== 9 #==================================================================
10 # Sources 10 # Sources
11 # 11 #
12 SET(GOB_GENERATED ${CMAKE_HOME_DIRECTORY}/src/ibus-chewing-engine.c 12 SET(GOB_GENERATED ${CMAKE_HOME_DIRECTORY}/src/ibus-chewing-engine.c
13 ${CMAKE_HOME_DIRECTORY}/src/ibus-chewing-engine.h 13 ${CMAKE_HOME_DIRECTORY}/src/ibus-chewing-engine.h
14 ${CMAKE_HOME_DIRECTORY}/src/ibus-chewing-engine-private.h 14 ${CMAKE_HOME_DIRECTORY}/src/ibus-chewing-engine-private.h
15 ${CMAKE_HOME_DIRECTORY}/src/maker-dialog.c 15 # Chromium change: Remove maker-dialog
16 ${CMAKE_HOME_DIRECTORY}/src/maker-dialog.h 16 #${CMAKE_HOME_DIRECTORY}/src/maker-dialog.c
17 ${CMAKE_HOME_DIRECTORY}/src/maker-dialog-private.h 17 #${CMAKE_HOME_DIRECTORY}/src/maker-dialog.h
18 #${CMAKE_HOME_DIRECTORY}/src/maker-dialog-private.h
18 ) 19 )
19 20
20 ADD_CUSTOM_COMMAND(OUTPUT ${GOB_GENERATED} 21 ADD_CUSTOM_COMMAND(OUTPUT ${GOB_GENERATED}
21 COMMAND ${GOB2} ${CMAKE_CURRENT_SOURCE_DIR}/IBusChewingEngine.gob -o ${CMAKE _CURRENT_SOURCE_DIR} 22 COMMAND ${GOB2} ${CMAKE_CURRENT_SOURCE_DIR}/IBusChewingEngine.gob -o ${CMAKE _CURRENT_SOURCE_DIR}
22 COMMAND ${GOB2} ${CMAKE_CURRENT_SOURCE_DIR}/MakerDialog.gob -o ${CMAKE_CURRE NT_SOURCE_DIR} 23 # Chromium change: Remove maker-dialog
23 DEPENDS IBusChewingEngine.gob MakerDialog.gob IBusChewingEngine-def.c 24 #COMMAND ${GOB2} ${CMAKE_CURRENT_SOURCE_DIR}/MakerDialog.gob -o ${CMAKE_CURR ENT_SOURCE_DIR}
25 #DEPENDS IBusChewingEngine.gob MakerDialog.gob IBusChewingEngine-def.c
26 DEPENDS IBusChewingEngine.gob IBusChewingEngine-def.c
24 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 27 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
25 ) 28 )
26 29
27 ADD_CUSTOM_TARGET(gob2 30 ADD_CUSTOM_TARGET(gob2
28 DEPENDS ${GOB_GENERATED} 31 DEPENDS ${GOB_GENERATED}
29 COMMENT "Preprocess with gob2." 32 COMMENT "Preprocess with gob2."
30 ) 33 )
31 34
32 35
33 SET_SOURCE_FILES_PROPERTIES(${GOB_GENERATED} 36 SET_SOURCE_FILES_PROPERTIES(${GOB_GENERATED}
34 PROPERTIES GENERATED TRUE) 37 PROPERTIES GENERATED TRUE)
35 38
36 # executable built from some source 39 # executable built from some source
37 ADD_EXECUTABLE(ibus-engine-chewing main.c 40 ADD_EXECUTABLE(ibus-engine-chewing main.c
38 ibus-chewing-engine.c 41 ibus-chewing-engine.c
39 maker-dialog.c 42 # Chromium change: Remove maker-dialog
43 #maker-dialog.c
40 ) 44 )
41 #ADD_EXECUTABLE(generate-gconf-schemas 45 #ADD_EXECUTABLE(generate-gconf-schemas
42 # generate-gconf-schemas.c 46 # generate-gconf-schemas.c
43 # maker-dialog.c 47 # maker-dialog.c
44 # ) 48 # )
45 49
46 # Link the executable to the library. 50 # Link the executable to the library.
47 TARGET_LINK_LIBRARIES(ibus-engine-chewing ${GTK2_LIBRARIES} ${IBUS_LIBRARIES} 51 # Chromium change: Do not link GConf or GTK
48 ${CHEWING_LIBRARIES} ${GCONF2_LIBRARIES} ${XTST_LIBRARIES}) 52 #TARGET_LINK_LIBRARIES(ibus-engine-chewing ${GTK2_LIBRARIES} ${IBUS_LIBRARIES}
53 # ${CHEWING_LIBRARIES} ${GCONF2_LIBRARIES} ${XTST_LIBRARIES})
54 TARGET_LINK_LIBRARIES(ibus-engine-chewing ${IBUS_LIBRARIES}
55 ${CHEWING_LIBRARIES} ${XTST_LIBRARIES})
49 56
50 #TARGET_LINK_LIBRARIES(generate-gconf-schemas ${GTK2_LIBRARIES}) 57 #TARGET_LINK_LIBRARIES(generate-gconf-schemas ${GTK2_LIBRARIES})
51 58
52 IF(NOT DEFINED LIB_INSTALL_DIR) 59 IF(NOT DEFINED LIB_INSTALL_DIR)
53 IF( $ENV{MACHTYPE} MATCHES "64") 60 IF( $ENV{MACHTYPE} MATCHES "64")
54 SET(LIB_INSTALL_DIR lib64) 61 SET(LIB_INSTALL_DIR lib64)
55 ADD_DEFINITIONS(-DLIB_INSTALL_DIR='"${LIB_INSTALL_DIR}"') 62 ADD_DEFINITIONS(-DLIB_INSTALL_DIR='"${LIB_INSTALL_DIR}"')
56 ELSE() 63 ELSE()
57 SET(LIB_INSTALL_DIR lib) 64 SET(LIB_INSTALL_DIR lib)
58 ADD_DEFINITIONS(-DLIB_INSTALL_DIR='"${LIB_INSTALL_DIR}"') 65 ADD_DEFINITIONS(-DLIB_INSTALL_DIR='"${LIB_INSTALL_DIR}"')
59 ENDIF() 66 ENDIF()
60 ENDIF() 67 ENDIF()
61 68
62 #ADD_CUSTOM_COMMAND(TARGET generate-gconf-schemas POST_BUILD 69 #ADD_CUSTOM_COMMAND(TARGET generate-gconf-schemas POST_BUILD
63 # COMMAND ${CMAKE_BINARY_DIR}/bin/generate-gconf-schemas -v 3 -l 70 # COMMAND ${CMAKE_BINARY_DIR}/bin/generate-gconf-schemas -v 3 -l
64 # "C;${TRANSLATED}" ${CMAKE_BINARY_DIR}/data/ibus-chewing.schemas 71 # "C;${TRANSLATED}" ${CMAKE_BINARY_DIR}/data/ibus-chewing.schemas
65 # COMMENT "Generating gconf-schemas" 72 # COMMENT "Generating gconf-schemas"
66 # VERBATIM 73 # VERBATIM
67 # ) 74 # )
68 75
69 INSTALL(TARGETS ibus-engine-chewing 76 INSTALL(TARGETS ibus-engine-chewing
70 RUNTIME DESTINATION ${LIBEXEC_DIR} 77 RUNTIME DESTINATION ${LIBEXEC_DIR}
71 LIBRARY DESTINATION ${LIB_INSTALL_DIR} 78 LIBRARY DESTINATION ${LIB_INSTALL_DIR}
72 ) 79 )
73 80
OLDNEW
« no previous file with comments | « no previous file | src/IBusChewingEngine.gob » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698