From 25f1371ce3c092c9f66a4ace266cde188a52e3b8 Mon Sep 17 00:00:00 2001 From: Enrico Zini Date: Mon, 14 Dec 2009 11:38:37 +0000 Subject: [PATCH] All builds with cmake --- gtkfisheyelist/CMakeLists.txt | 47 ++++++++------------------- src/CMakeLists.txt | 46 ++++++++++++-------------- src/app.vala | 2 +- src/app_debug.vala | 2 +- src/{widgets => }/calendar.vala | 0 src/config.vala | 2 +- src/{omhacks.vapi => libomhacks.vapi} | 0 src/registry.vala | 2 +- src/zavai.vala | 1 - 9 files changed, 39 insertions(+), 63 deletions(-) rename src/{widgets => }/calendar.vala (100%) rename src/{omhacks.vapi => libomhacks.vapi} (100%) diff --git a/gtkfisheyelist/CMakeLists.txt b/gtkfisheyelist/CMakeLists.txt index 5549f3a..270b403 100644 --- a/gtkfisheyelist/CMakeLists.txt +++ b/gtkfisheyelist/CMakeLists.txt @@ -1,46 +1,27 @@ project(gtkfisheyelist) - -include(FindPkgConfig) +include(../vala.cmake) set(gtkfisheyelist_version 0.1) -set(VFLAGS -C --pkg gtk+-2.0) - -pkg_check_modules(GTK REQUIRED gtk+-2.0) -find_program(VALAC valac) +set(VALA_PACKAGES gtk+-2.0) -file(GLOB fevala gtkfisheye*.vala) -file(RELATIVE_PATH fesrc ${gtkfisheyelist_SOURCE_DIR} ${fevala}) -string(REGEX REPLACE "\\.vala$" ".c" fesrc ${fesrc}) - -file(GLOB demovala demo*.vala) -file(RELATIVE_PATH demosrc ${gtkfisheyelist_SOURCE_DIR} ${demovala}) -string(REGEX REPLACE "\\.vala$" ".c" demosrc ${demosrc}) +add_packages(GFEL ${VALA_PACKAGES}) -add_custom_command( - DEPENDS ${fevala} - OUTPUT ${fesrc} gtkfisheyelist.h gtkfisheyelist.vapi - COMMAND ${VALAC} ${VFLAGS} -H gtkfisheyelist.h --library=gtkfisheyelist ${fevala} -) +set(VFLAGS --vapidir=${gtkfisheyelist_BINARY_DIR}) +add_definitions(-Wall -Werror -I${gtkfisheyelist_BINARY_DIR}) -add_custom_command( - DEPENDS ${demovala} - OUTPUT ${demosrc} ${demohdr} - COMMAND ${VALAC} ${VFLAGS} --pkg=gtkfisheyelist --vapidir=${gtkfisheyelist_BINARY_DIR} ${demovala} -) -add_definitions(-Wall -Werror ${GTK_CFLAGS} -I${gtkfisheyelist_BINARY_DIR}) -link_libraries(${GTK_LDFLAGS}) - -set_source_files_properties(${fesrc} PROPERTIES GENERATED 1) -set_source_files_properties(${fehdr} PROPERTIES GENERATED 1) - -add_library(gtkfisheyelist SHARED ${fesrc}) -add_library(gtkfisheyelist-static STATIC ${fesrc}) +file(GLOB fevala gtkfisheye*.vala) +add_vala_library(gtkfisheyelist ${fevala}) +add_library(gtkfisheyelist SHARED ${gtkfisheyelist_CSOURCES}) +add_library(gtkfisheyelist-static STATIC ${gtkfisheyelist_CSOURCES}) set_target_properties(gtkfisheyelist PROPERTIES VERSION ${gtkfisheyelist_version} SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) set_target_properties(gtkfisheyelist-static PROPERTIES VERSION ${gtkfisheyelist_version} SOVERSION 0 OUTPUT_NAME "gtkfisheyelist" CLEAN_DIRECT_OUTPUT 1) -add_executable(gtkfisheyedemo ${demosrc}) +set(VALA_PACKAGES ${VALA_PACKAGES} gtkfisheyelist) +file(GLOB demovala demo*.vala) +add_vala_program(gtkfisheyedemo ${demovala}) +add_executable(gtkfisheyedemo ${gtkfisheyedemo_CSOURCES}) target_link_libraries(gtkfisheyedemo gtkfisheyelist-static) set(prefix "${CMAKE_INSTALL_PREFIX}") @@ -53,7 +34,7 @@ install(TARGETS gtkfisheyelist gtkfisheyelist-static LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -install(FILES ${fehdr} DESTINATION include/gtkfisheyelist) +install(FILES gtkfisheyelist.h DESTINATION include/gtkfisheyelist) install(FILES ${gtkfisheyelist_BINARY_DIR}/libgtkfisheyelist.pc DESTINATION lib/pkgconfig) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c5c80d9..441ad8a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,36 +1,32 @@ project(zavai) - -include(FindPkgConfig) +include(../vala.cmake) set(zavai_version 0.1) -set(VFLAGS -C --pkg gee-1.0 --pkg dbus-glib-1 --pkg gtk+-2.0 --pkg posix --pkg libwnck-1.0 --vapidir=${zavai_SOURCE_DIR} --pkg linux-input --pkg dbus-extra --pkg devkit-power-gobject --pkg omhacks) - -pkg_check_modules(GTK REQUIRED gtk+-2.0) -pkg_check_modules(GEE REQUIRED gee-1.0) -pkg_check_modules(DBUS REQUIRED dbus-glib-1>=0.80) -pkg_check_modules(WNCK REQUIRED libwnck-1.0>=2.26.0) -pkg_check_modules(DEVKITPOWER REQUIRED devkit-power-gobject>=010) -pkg_check_modules(OMHACKS REQUIRED libomhacks) -find_program(VALAC valac) +set(packages gtk+-2.0 gee-1.0 dbus-glib-1>=0.80 libwnck-1.0>=2.26.0 devkit-power-gobject>=010 libomhacks) +add_packages(ZAVAI ${packages}) -file(GLOB zavala *.vala) -string(REGEX REPLACE "^.+/(.+)\\.vala$" "${zavai_BINARY_DIR}/\\1.c" zasrc ${zavala}) +set(VALA_PACKAGES ${packages} posix linux-input dbus-extra gtkfisheyelist) +set(VFLAGS --vapidir=${zavai_SOURCE_DIR} --vapidir=${gtkfisheyelist_BINARY_DIR}) +add_definitions(-Wall) +# -Werror -add_custom_command( - DEPENDS ${zavala} - OUTPUT ${zasrc} - COMMAND ${VALAC} ${VFLAGS} --pkg=gtkfisheyelist --vapidir=${gtkfisheyelist_BINARY_DIR} ${zavala} -) +file(GLOB libvala [a-y]*.vala widgets/*.vala) +add_vala_library(libzavai ${libvala}) +add_library(libzavai STATIC ${libzavai_CSOURCES}) -include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) -# -Werror -add_definitions(-Wall ${GTK_CFLAGS} ${GEE_CFLAGS} ${DBUS_CFLAGS} ${WNCK_CFLAGS} ${DEVKITPOWER_CFLAGS} ${OMHACKS_CFLAGS} -I${gtkfisheyelist_BINARY_DIR}) -link_libraries(wibble ${GTK_LDFLAGS} ${GEE_LDFLAGS} ${DBUS_LDFLAGS} ${WNCK_LDFLAGS} ${DEVKITPOWER_LDFLAGS} ${OMHACKS_LDFLAGS} gtkfisheyelist-static) +add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR}) +set(VFLAGS ${VFLAGS} --vapidir=${zavai_BINARY_DIR}) +set(VALA_PACKAGES ${VALA_PACKAGES} libzavai) +link_libraries(gtkfisheyelist-static libzavai) -set_source_files_properties(${zasrc} PROPERTIES GENERATED 1) -set_source_files_properties(${zahdr} PROPERTIES GENERATED 1) +file(GLOB zavala zavai.vala) +add_vala_program(zavai ${zavala}) +add_executable(zavai ${zavai_CSOURCES}) -add_executable(zavai ${zasrc}) +file(GLOB zacvala zavai-calendar.vala) +add_vala_program(zavai-calendar ${zacvala}) +add_executable(zavai-calendar ${zavai-calendar_CSOURCES}) install(TARGETS zavai RUNTIME DESTINATION bin) +install(TARGETS zavai-calendar RUNTIME DESTINATION bin) diff --git a/src/app.vala b/src/app.vala index 4d2813d..b1095d5 100644 --- a/src/app.vala +++ b/src/app.vala @@ -407,6 +407,6 @@ public class StatusIcon : Gtk.Button } -zavai.Zavai app; +public zavai.Zavai app; } diff --git a/src/app_debug.vala b/src/app_debug.vala index 3e053f9..bf6a1fa 100644 --- a/src/app_debug.vala +++ b/src/app_debug.vala @@ -78,7 +78,7 @@ class Quitter(gtk.Action): self.connect("activate", gtk.main_quit) */ -void init() +public void init() { //label_on = "Stop useless service"; //label_off = "Start useless service"; diff --git a/src/widgets/calendar.vala b/src/calendar.vala similarity index 100% rename from src/widgets/calendar.vala rename to src/calendar.vala diff --git a/src/config.vala b/src/config.vala index 4aaede5..f3de748 100644 --- a/src/config.vala +++ b/src/config.vala @@ -113,6 +113,6 @@ class Config: homedir = property(_get_homedir) */ -Config config = null; +public Config config = null; } diff --git a/src/omhacks.vapi b/src/libomhacks.vapi similarity index 100% rename from src/omhacks.vapi rename to src/libomhacks.vapi diff --git a/src/registry.vala b/src/registry.vala index 181aa50..d6b545d 100644 --- a/src/registry.vala +++ b/src/registry.vala @@ -150,7 +150,7 @@ public class Registry : Object, Resource } } -zavai.Registry registry; +public zavai.Registry registry; } diff --git a/src/zavai.vala b/src/zavai.vala index c8e9305..4ab0327 100644 --- a/src/zavai.vala +++ b/src/zavai.vala @@ -131,7 +131,6 @@ static int main (string[] args) { zavai.ui.kbd.init(); zavai.ui.wm.init(); zavai.ui.calendar.init(); - zavai.ui.polygen.init(); zavai.ui.debug.init(); //zavai.app.show_applet("menu.main"); -- 2.39.5