Merge branch 'master' into gregoa

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c5c80d954a451cb4c9b088d2b61f137e44fbe2bf..b19726749e30727c40c6687154f8eeae1c959367 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,36 +1,33 @@
 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)
-
-file(GLOB zavala *.vala)
-string(REGEX REPLACE "^.+/(.+)\\.vala$" "${zavai_BINARY_DIR}/\\1.c" zasrc ${zavala})
+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)
 
-add_custom_command(
-    DEPENDS ${zavala}
-    OUTPUT ${zasrc}
-    COMMAND ${VALAC} ${VFLAGS} --pkg=gtkfisheyelist --vapidir=${gtkfisheyelist_BINARY_DIR} ${zavala}
-)
-
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+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 
-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)
 
-set_source_files_properties(${zasrc} PROPERTIES GENERATED 1)
-set_source_files_properties(${zahdr} PROPERTIES GENERATED 1)
+#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)
 
-add_executable(zavai ${zasrc})
+file(GLOB zavala *.vala)
+add_vala_program(zavai ${zavala})
+add_executable(zavai ${zavai_CSOURCES})
 
 install(TARGETS zavai RUNTIME DESTINATION bin)
+install(FILES sat-monitor DESTINATION bin)