Merge branch 'master' into gregoa

[gregoa/zavai.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 06cacbd24af4981a1bdd7369afb890176ec5f950..b19726749e30727c40c6687154f8eeae1c959367 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,43 +3,31 @@ include(../vala.cmake)
 
 set(zavai_version 0.1)
 
-set(packages gtk+-2.0 dbus-glib-1>=0.80 libwnck-1.0>=2.26.0 lua5.1 libomhacks x11 gdk-x11-2.0 libgps gstreamer-0.10)
-add_packages(ZAVAI ${packages})
+set(packages gtk+-2.0 gdk-pixbuf-2.0 dbus-glib-1>=0.80 libwnck-1.0>=2.26.0 libomhacks x11 gdk-x11-2.0 libgps gstreamer-0.10)
+add_packages(ZAVAI ${packages} lua5.1)
 
-set(VALA_PACKAGES ${packages} posix linux-input dbus-extra gtkfisheyelist libzavai)
+set(VALA_PACKAGES x11 ${packages} posix linux-input dbus-extra gtkfisheyelist lua)
 set(VFLAGS --vapidir=${zavai_SOURCE_DIR} --vapidir=${gtkfisheyelist_BINARY_DIR})
 add_definitions(-Wall)
 # -Werror 
 
-pkg_check_modules(DKP devkit-power-gobject>=010)
-if (DKP_VERSION)
-  message("-- Using devkit-power-gobject version ${DKP_VERSION}")
-  set(VFLAGS ${VFLAGS} --define=USE_DKP)
-  set(VALA_PACKAGES ${VALA_PACKAGES} devkit-power-gobject)
-  add_definitions(-DUSE_DKP ${DKP_CFLAGS})
-  link_libraries(${DKP_LDFLAGS})
-else()
-  message("-- Not using devkit-power-gobject")
-endif ()
-
-set(VFLAGS ${VFLAGS} --vapidir=${zavai_BINARY_DIR} --vapidir=${libzavai_SOURCE_DIR} --vapidir=${libzavai_BINARY_DIR})
-
-file(GLOB libvala [a-y]*.vala widgets/*.vala)
-add_vala_library(libzavaiui ${libvala})
-add_library(libzavaiui STATIC ${libzavaiui_CSOURCES})
-
-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} -I${libzavai_BINARY_DIR})
-set(VALA_PACKAGES ${VALA_PACKAGES} libzavai libzavaiui)
-link_libraries(gtkfisheyelist-static libzavai libzavaiui)
-
-file(GLOB zavala zavai.vala)
+#pkg_check_modules(DKP upower-glib>=0.9.9)
+#if (DKP_VERSION)
+#  message("-- Using upower-glib version ${DKP_VERSION}")
+#  set(VFLAGS ${VFLAGS} --define=USE_DKP)
+#  set(VALA_PACKAGES ${VALA_PACKAGES} upower-glib)
+#  add_definitions(-DUSE_DKP ${DKP_CFLAGS})
+#  link_libraries(${DKP_LDFLAGS})
+#else()
+#  message("-- Not using upower-glib")
+#endif ()
+
+add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR})
+link_libraries(gtkfisheyelist-static)
+
+file(GLOB zavala *.vala)
 add_vala_program(zavai ${zavala})
 add_executable(zavai ${zavai_CSOURCES})
 
-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)
 install(FILES sat-monitor DESTINATION bin)