Merge branch 'master' into gregoa

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

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d27624c4dff684301a36a2240bc8d462bf389560..d2c1d6b3360b18addaa82a60840b1726d6d0eac3 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,30 +1,15 @@
 project(tests)
 include(../vala.cmake)
 
-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)
+set(packages gtk+-2.0 dbus-glib-1>=0.80 libwnck-1.0>=2.26.0 lua libomhacks x11 gdk-x11-2.0 libgps gstreamer-0.10)
 add_packages(ZAVAI ${packages})
 
-set(VALA_PACKAGES ${packages} posix linux-input dbus-extra gtkfisheyelist libzavai)
-set(VFLAGS --vapidir=${gtkfisheyelist_BINARY_DIR} --vapidir=${libzavai_SOURCE_DIR} --vapidir=${libzavai_BINARY_DIR})
+set(VALA_PACKAGES ${packages} posix linux-input dbus-extra gtkfisheyelist)
+set(VFLAGS --vapidir=${gtkfisheyelist_BINARY_DIR} --vapidir=${zavai_SOURCE_DIR} --vapidir=${zavai_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})
-
-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)
-link_libraries(libzavai)
+add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR})
 
 file(GLOB gsm-receive test-gsm-receive.vala)
 add_vala_program(test-gsm-receive ${gsm-receive})