sync
authorAlan Knowles <alan@roojs.com>
Thu, 14 Feb 2019 08:22:21 +0000 (16:22 +0800)
committerAlan Knowles <alan@roojs.com>
Thu, 14 Feb 2019 08:22:21 +0000 (16:22 +0800)
CMakeCache.txt
CMakeFiles/CMakeOutput.log
CMakeLists.txt
cmake/FindGLib.cmake
cmake/vala/FindVala.cmake [deleted file]
src/CMakeLists.txt
src/main.vala [deleted file]

index 4c46ad2..2e5c62a 100644 (file)
@@ -168,12 +168,111 @@ CMAKE_STRIP:FILEPATH=/usr/bin/strip
 // Studio IDE projects all commands are done without /nologo.
 CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
 
+//Path to a program.
+GDBUS_CODEGEN:FILEPATH=/usr/bin/gdbus-codegen
+
+//Path to a library.
+GIO:FILEPATH=/usr/lib/x86_64-linux-gnu/libgio-2.0.so
+
+//Path to a library.
+GLIB:FILEPATH=/usr/lib/x86_64-linux-gnu/libglib-2.0.so
+
+//Path to a program.
+GLIB_COMPILE_RESOURCES:FILEPATH=/usr/bin/glib-compile-resources
+
+//Path to a program.
+GLIB_COMPILE_SCHEMAS:FILEPATH=/usr/bin/glib-compile-schemas
+
+//Path to a file.
+GLIB_CONFIG_INCLUDE_DIR:PATH=/usr/lib/x86_64-linux-gnu/glib-2.0/include
+
+//Path to a program.
+GLIB_GENMARSHAL:FILEPATH=/usr/bin/glib-genmarshal
+
+//Path to a file.
+GLIB_INCLUDE_DIRS:PATH=/usr/include/glib-2.0
+
+//Path to a program.
+GLIB_MKENUMS:FILEPATH=/usr/bin/glib-mkenums
+
 //The directory containing a CMake configuration file for GLib.
 GLib_DIR:PATH=GLib_DIR-NOTFOUND
 
+//Path to a library.
+GOBJECT:FILEPATH=/usr/lib/x86_64-linux-gnu/libgobject-2.0.so
+
+//pkg-config executable
+PKG_CONFIG_EXECUTABLE:FILEPATH=/usr/bin/pkg-config
+
 //Path to a program.
 VALA_EXECUTABLE:FILEPATH=/usr/bin/valac
 
+//Dependencies for the target
+libroojspacker-1.2_LIB_DEPENDS:STATIC=general;gobject-2.0;general;glib-2.0;general;gio-2.0;general;gobject-2.0;general;glib-2.0;general;gee-0.8;general;gobject-2.0;general;glib-2.0;general;gthread-2.0;general;glib-2.0;general;json-glib-1.0;general;gio-2.0;general;gobject-2.0;general;glib-2.0;
+
+//Dependencies for the target
+libroojspacker_LIB_DEPENDS:STATIC=general;gobject-2.0;general;glib-2.0;general;gio-2.0;general;gobject-2.0;general;glib-2.0;general;gee-0.8;general;gobject-2.0;general;glib-2.0;general;gthread-2.0;general;glib-2.0;general;json-glib-1.0;general;gio-2.0;general;gobject-2.0;general;glib-2.0;
+
+//Path to a library.
+pkgcfg_lib_GEE_gee-0.8:FILEPATH=/usr/lib/x86_64-linux-gnu/libgee-0.8.so
+
+//Path to a library.
+pkgcfg_lib_GEE_glib-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libglib-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GEE_gobject-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libgobject-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GIO_PKG_gio-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libgio-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GIO_PKG_glib-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libglib-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GIO_PKG_gobject-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libgobject-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GIO_gio-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libgio-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GIO_glib-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libglib-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GIO_gobject-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libgobject-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GLIB_PKG_glib-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libglib-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GOBJECT_PKG_glib-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libglib-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GOBJECT_PKG_gobject-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libgobject-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GOBJECT_glib-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libglib-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GOBJECT_gobject-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libgobject-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GTHREAD_glib-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libglib-2.0.so
+
+//Path to a library.
+pkgcfg_lib_GTHREAD_gthread-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libgthread-2.0.so
+
+//Path to a library.
+pkgcfg_lib_JSON_gio-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libgio-2.0.so
+
+//Path to a library.
+pkgcfg_lib_JSON_glib-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libglib-2.0.so
+
+//Path to a library.
+pkgcfg_lib_JSON_gobject-2.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libgobject-2.0.so
+
+//Path to a library.
+pkgcfg_lib_JSON_json-glib-1.0:FILEPATH=/usr/lib/x86_64-linux-gnu/libjson-glib-1.0.so
+
 //Value Computed by CMake
 roojspacker_BINARY_DIR:STATIC=/home/alan/gitlive/roojspacker
 
@@ -185,6 +284,8 @@ roojspacker_SOURCE_DIR:STATIC=/home/alan/gitlive/roojspacker
 # INTERNAL cache entries
 ########################
 
+//Test CFLAG_Wincompatible_pointer_types
+CFLAG_Wincompatible_pointer_types:INTERNAL=1
 //ADVANCED property for variable: CMAKE_AR
 CMAKE_AR-ADVANCED:INTERNAL=1
 //This is the directory where this CMakeCache.txt was created
@@ -267,7 +368,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_NM
 CMAKE_NM-ADVANCED:INTERNAL=1
 //number of local generators
-CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1
+CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=3
 //ADVANCED property for variable: CMAKE_OBJCOPY
 CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_OBJDUMP
@@ -308,8 +409,300 @@ CMAKE_STRIP-ADVANCED:INTERNAL=1
 CMAKE_UNAME:INTERNAL=/bin/uname
 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
 CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
+//Details about finding GLib
+FIND_PACKAGE_MESSAGE_DETAILS_GLib:INTERNAL=[/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include][/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include][/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include][/usr/bin/glib-mkenums][/usr/bin/glib-genmarshal][/usr/bin/glib-compile-schemas][/usr/bin/glib-compile-resources][/usr/bin/gdbus-codegen][v2.58.1(2.38)]
+//Details about finding PkgConfig
+FIND_PACKAGE_MESSAGE_DETAILS_PkgConfig:INTERNAL=[/usr/bin/pkg-config][v0.29.1()]
 //Details about finding Vala
-FIND_PACKAGE_MESSAGE_DETAILS_Vala:INTERNAL=[/usr/bin/valac][v0.36.6()]
+FIND_PACKAGE_MESSAGE_DETAILS_Vala:INTERNAL=[/usr/bin/valac][v0.36.6(0.36.0)]
+GEE_CFLAGS:INTERNAL=-I/usr/include/gee-0.8;-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GEE_CFLAGS_I:INTERNAL=
+GEE_CFLAGS_OTHER:INTERNAL=
+GEE_FOUND:INTERNAL=1
+GEE_INCLUDEDIR:INTERNAL=/usr/include
+GEE_INCLUDE_DIRS:INTERNAL=/usr/include/gee-0.8;/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GEE_LDFLAGS:INTERNAL=-lgee-0.8;-lgobject-2.0;-lglib-2.0
+GEE_LDFLAGS_OTHER:INTERNAL=
+GEE_LIBDIR:INTERNAL=/usr/lib/x86_64-linux-gnu
+GEE_LIBRARIES:INTERNAL=gee-0.8;gobject-2.0;glib-2.0
+GEE_LIBRARY_DIRS:INTERNAL=
+GEE_LIBS:INTERNAL=
+GEE_LIBS_L:INTERNAL=
+GEE_LIBS_OTHER:INTERNAL=
+GEE_LIBS_PATHS:INTERNAL=
+GEE_PREFIX:INTERNAL=/usr
+GEE_STATIC_CFLAGS:INTERNAL=-I/usr/include/gee-0.8;-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GEE_STATIC_CFLAGS_I:INTERNAL=
+GEE_STATIC_CFLAGS_OTHER:INTERNAL=
+GEE_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/gee-0.8;/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GEE_STATIC_LDFLAGS:INTERNAL=-lgee-0.8;-lgobject-2.0;-lffi;-lglib-2.0;-pthread;-lpcre;-pthread
+GEE_STATIC_LDFLAGS_OTHER:INTERNAL=-pthread
+GEE_STATIC_LIBDIR:INTERNAL=
+GEE_STATIC_LIBRARIES:INTERNAL=gee-0.8;gobject-2.0;ffi;glib-2.0;pcre
+GEE_STATIC_LIBRARY_DIRS:INTERNAL=
+GEE_STATIC_LIBS:INTERNAL=
+GEE_STATIC_LIBS_L:INTERNAL=
+GEE_STATIC_LIBS_OTHER:INTERNAL=
+GEE_STATIC_LIBS_PATHS:INTERNAL=
+GEE_VERSION:INTERNAL=0.20.1
+GEE_gee-0.8_INCLUDEDIR:INTERNAL=
+GEE_gee-0.8_LIBDIR:INTERNAL=
+GEE_gee-0.8_PREFIX:INTERNAL=
+GEE_gee-0.8_VERSION:INTERNAL=
+GIO_CFLAGS:INTERNAL=-pthread;-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GIO_CFLAGS_I:INTERNAL=
+GIO_CFLAGS_OTHER:INTERNAL=-pthread
+GIO_FOUND:INTERNAL=1
+GIO_INCLUDEDIR:INTERNAL=/usr/include
+GIO_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GIO_LDFLAGS:INTERNAL=-lgio-2.0;-lgobject-2.0;-lglib-2.0
+GIO_LDFLAGS_OTHER:INTERNAL=
+GIO_LIBDIR:INTERNAL=/usr/lib/x86_64-linux-gnu
+GIO_LIBRARIES:INTERNAL=gio-2.0;gobject-2.0;glib-2.0
+GIO_LIBRARY_DIRS:INTERNAL=
+GIO_LIBS:INTERNAL=
+GIO_LIBS_L:INTERNAL=
+GIO_LIBS_OTHER:INTERNAL=
+GIO_LIBS_PATHS:INTERNAL=
+GIO_PKG_CFLAGS:INTERNAL=-pthread;-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GIO_PKG_CFLAGS_I:INTERNAL=
+GIO_PKG_CFLAGS_OTHER:INTERNAL=-pthread
+GIO_PKG_FOUND:INTERNAL=1
+GIO_PKG_INCLUDEDIR:INTERNAL=/usr/include
+GIO_PKG_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GIO_PKG_LDFLAGS:INTERNAL=-lgio-2.0;-lgobject-2.0;-lglib-2.0
+GIO_PKG_LDFLAGS_OTHER:INTERNAL=
+GIO_PKG_LIBDIR:INTERNAL=/usr/lib/x86_64-linux-gnu
+GIO_PKG_LIBRARIES:INTERNAL=gio-2.0;gobject-2.0;glib-2.0
+GIO_PKG_LIBRARY_DIRS:INTERNAL=
+GIO_PKG_LIBS:INTERNAL=
+GIO_PKG_LIBS_L:INTERNAL=
+GIO_PKG_LIBS_OTHER:INTERNAL=
+GIO_PKG_LIBS_PATHS:INTERNAL=
+GIO_PKG_PREFIX:INTERNAL=/usr
+GIO_PKG_STATIC_CFLAGS:INTERNAL=-pthread;-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GIO_PKG_STATIC_CFLAGS_I:INTERNAL=
+GIO_PKG_STATIC_CFLAGS_OTHER:INTERNAL=-pthread
+GIO_PKG_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GIO_PKG_STATIC_LDFLAGS:INTERNAL=-lgio-2.0;-lz;-lresolv;-lselinux;-lmount;-lgmodule-2.0;-pthread;-ldl;-lgobject-2.0;-lffi;-lglib-2.0;-pthread;-lpcre;-pthread
+GIO_PKG_STATIC_LDFLAGS_OTHER:INTERNAL=-pthread
+GIO_PKG_STATIC_LIBDIR:INTERNAL=
+GIO_PKG_STATIC_LIBRARIES:INTERNAL=gio-2.0;z;resolv;selinux;mount;gmodule-2.0;dl;gobject-2.0;ffi;glib-2.0;pcre
+GIO_PKG_STATIC_LIBRARY_DIRS:INTERNAL=
+GIO_PKG_STATIC_LIBS:INTERNAL=
+GIO_PKG_STATIC_LIBS_L:INTERNAL=
+GIO_PKG_STATIC_LIBS_OTHER:INTERNAL=
+GIO_PKG_STATIC_LIBS_PATHS:INTERNAL=
+GIO_PKG_VERSION:INTERNAL=2.58.1
+GIO_PKG_gio-2.0_INCLUDEDIR:INTERNAL=
+GIO_PKG_gio-2.0_LIBDIR:INTERNAL=
+GIO_PKG_gio-2.0_PREFIX:INTERNAL=
+GIO_PKG_gio-2.0_VERSION:INTERNAL=
+GIO_PREFIX:INTERNAL=/usr
+GIO_STATIC_CFLAGS:INTERNAL=-pthread;-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GIO_STATIC_CFLAGS_I:INTERNAL=
+GIO_STATIC_CFLAGS_OTHER:INTERNAL=-pthread
+GIO_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GIO_STATIC_LDFLAGS:INTERNAL=-lgio-2.0;-lz;-lresolv;-lselinux;-lmount;-lgmodule-2.0;-pthread;-ldl;-lgobject-2.0;-lffi;-lglib-2.0;-pthread;-lpcre;-pthread
+GIO_STATIC_LDFLAGS_OTHER:INTERNAL=-pthread
+GIO_STATIC_LIBDIR:INTERNAL=
+GIO_STATIC_LIBRARIES:INTERNAL=gio-2.0;z;resolv;selinux;mount;gmodule-2.0;dl;gobject-2.0;ffi;glib-2.0;pcre
+GIO_STATIC_LIBRARY_DIRS:INTERNAL=
+GIO_STATIC_LIBS:INTERNAL=
+GIO_STATIC_LIBS_L:INTERNAL=
+GIO_STATIC_LIBS_OTHER:INTERNAL=
+GIO_STATIC_LIBS_PATHS:INTERNAL=
+GIO_VERSION:INTERNAL=2.58.1
+GIO_gio-2.0_INCLUDEDIR:INTERNAL=
+GIO_gio-2.0_LIBDIR:INTERNAL=
+GIO_gio-2.0_PREFIX:INTERNAL=
+GIO_gio-2.0_VERSION:INTERNAL=
+GLIB_PKG_CFLAGS:INTERNAL=-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GLIB_PKG_CFLAGS_I:INTERNAL=
+GLIB_PKG_CFLAGS_OTHER:INTERNAL=
+GLIB_PKG_FOUND:INTERNAL=1
+GLIB_PKG_INCLUDEDIR:INTERNAL=/usr/include
+GLIB_PKG_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GLIB_PKG_LDFLAGS:INTERNAL=-lglib-2.0
+GLIB_PKG_LDFLAGS_OTHER:INTERNAL=
+GLIB_PKG_LIBDIR:INTERNAL=/usr/lib/x86_64-linux-gnu
+GLIB_PKG_LIBRARIES:INTERNAL=glib-2.0
+GLIB_PKG_LIBRARY_DIRS:INTERNAL=
+GLIB_PKG_LIBS:INTERNAL=
+GLIB_PKG_LIBS_L:INTERNAL=
+GLIB_PKG_LIBS_OTHER:INTERNAL=
+GLIB_PKG_LIBS_PATHS:INTERNAL=
+GLIB_PKG_PREFIX:INTERNAL=/usr
+GLIB_PKG_STATIC_CFLAGS:INTERNAL=-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GLIB_PKG_STATIC_CFLAGS_I:INTERNAL=
+GLIB_PKG_STATIC_CFLAGS_OTHER:INTERNAL=
+GLIB_PKG_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GLIB_PKG_STATIC_LDFLAGS:INTERNAL=-lglib-2.0;-pthread;-lpcre;-pthread
+GLIB_PKG_STATIC_LDFLAGS_OTHER:INTERNAL=-pthread
+GLIB_PKG_STATIC_LIBDIR:INTERNAL=
+GLIB_PKG_STATIC_LIBRARIES:INTERNAL=glib-2.0;pcre
+GLIB_PKG_STATIC_LIBRARY_DIRS:INTERNAL=
+GLIB_PKG_STATIC_LIBS:INTERNAL=
+GLIB_PKG_STATIC_LIBS_L:INTERNAL=
+GLIB_PKG_STATIC_LIBS_OTHER:INTERNAL=
+GLIB_PKG_STATIC_LIBS_PATHS:INTERNAL=
+GLIB_PKG_VERSION:INTERNAL=2.58.1
+GLIB_PKG_glib-2.0_INCLUDEDIR:INTERNAL=
+GLIB_PKG_glib-2.0_LIBDIR:INTERNAL=
+GLIB_PKG_glib-2.0_PREFIX:INTERNAL=
+GLIB_PKG_glib-2.0_VERSION:INTERNAL=
+GOBJECT_CFLAGS:INTERNAL=-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GOBJECT_CFLAGS_I:INTERNAL=
+GOBJECT_CFLAGS_OTHER:INTERNAL=
+GOBJECT_FOUND:INTERNAL=1
+GOBJECT_INCLUDEDIR:INTERNAL=/usr/include
+GOBJECT_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GOBJECT_LDFLAGS:INTERNAL=-lgobject-2.0;-lglib-2.0
+GOBJECT_LDFLAGS_OTHER:INTERNAL=
+GOBJECT_LIBDIR:INTERNAL=/usr/lib/x86_64-linux-gnu
+GOBJECT_LIBRARIES:INTERNAL=gobject-2.0;glib-2.0
+GOBJECT_LIBRARY_DIRS:INTERNAL=
+GOBJECT_LIBS:INTERNAL=
+GOBJECT_LIBS_L:INTERNAL=
+GOBJECT_LIBS_OTHER:INTERNAL=
+GOBJECT_LIBS_PATHS:INTERNAL=
+GOBJECT_PKG_CFLAGS:INTERNAL=-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GOBJECT_PKG_CFLAGS_I:INTERNAL=
+GOBJECT_PKG_CFLAGS_OTHER:INTERNAL=
+GOBJECT_PKG_FOUND:INTERNAL=1
+GOBJECT_PKG_INCLUDEDIR:INTERNAL=/usr/include
+GOBJECT_PKG_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GOBJECT_PKG_LDFLAGS:INTERNAL=-lgobject-2.0;-lglib-2.0
+GOBJECT_PKG_LDFLAGS_OTHER:INTERNAL=
+GOBJECT_PKG_LIBDIR:INTERNAL=/usr/lib/x86_64-linux-gnu
+GOBJECT_PKG_LIBRARIES:INTERNAL=gobject-2.0;glib-2.0
+GOBJECT_PKG_LIBRARY_DIRS:INTERNAL=
+GOBJECT_PKG_LIBS:INTERNAL=
+GOBJECT_PKG_LIBS_L:INTERNAL=
+GOBJECT_PKG_LIBS_OTHER:INTERNAL=
+GOBJECT_PKG_LIBS_PATHS:INTERNAL=
+GOBJECT_PKG_PREFIX:INTERNAL=/usr
+GOBJECT_PKG_STATIC_CFLAGS:INTERNAL=-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GOBJECT_PKG_STATIC_CFLAGS_I:INTERNAL=
+GOBJECT_PKG_STATIC_CFLAGS_OTHER:INTERNAL=
+GOBJECT_PKG_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GOBJECT_PKG_STATIC_LDFLAGS:INTERNAL=-lgobject-2.0;-lffi;-lglib-2.0;-pthread;-lpcre;-pthread
+GOBJECT_PKG_STATIC_LDFLAGS_OTHER:INTERNAL=-pthread
+GOBJECT_PKG_STATIC_LIBDIR:INTERNAL=
+GOBJECT_PKG_STATIC_LIBRARIES:INTERNAL=gobject-2.0;ffi;glib-2.0;pcre
+GOBJECT_PKG_STATIC_LIBRARY_DIRS:INTERNAL=
+GOBJECT_PKG_STATIC_LIBS:INTERNAL=
+GOBJECT_PKG_STATIC_LIBS_L:INTERNAL=
+GOBJECT_PKG_STATIC_LIBS_OTHER:INTERNAL=
+GOBJECT_PKG_STATIC_LIBS_PATHS:INTERNAL=
+GOBJECT_PKG_VERSION:INTERNAL=2.58.1
+GOBJECT_PKG_gobject-2.0_INCLUDEDIR:INTERNAL=
+GOBJECT_PKG_gobject-2.0_LIBDIR:INTERNAL=
+GOBJECT_PKG_gobject-2.0_PREFIX:INTERNAL=
+GOBJECT_PKG_gobject-2.0_VERSION:INTERNAL=
+GOBJECT_PREFIX:INTERNAL=/usr
+GOBJECT_STATIC_CFLAGS:INTERNAL=-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GOBJECT_STATIC_CFLAGS_I:INTERNAL=
+GOBJECT_STATIC_CFLAGS_OTHER:INTERNAL=
+GOBJECT_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GOBJECT_STATIC_LDFLAGS:INTERNAL=-lgobject-2.0;-lffi;-lglib-2.0;-pthread;-lpcre;-pthread
+GOBJECT_STATIC_LDFLAGS_OTHER:INTERNAL=-pthread
+GOBJECT_STATIC_LIBDIR:INTERNAL=
+GOBJECT_STATIC_LIBRARIES:INTERNAL=gobject-2.0;ffi;glib-2.0;pcre
+GOBJECT_STATIC_LIBRARY_DIRS:INTERNAL=
+GOBJECT_STATIC_LIBS:INTERNAL=
+GOBJECT_STATIC_LIBS_L:INTERNAL=
+GOBJECT_STATIC_LIBS_OTHER:INTERNAL=
+GOBJECT_STATIC_LIBS_PATHS:INTERNAL=
+GOBJECT_VERSION:INTERNAL=2.58.1
+GOBJECT_gobject-2.0_INCLUDEDIR:INTERNAL=
+GOBJECT_gobject-2.0_LIBDIR:INTERNAL=
+GOBJECT_gobject-2.0_PREFIX:INTERNAL=
+GOBJECT_gobject-2.0_VERSION:INTERNAL=
+GTHREAD_CFLAGS:INTERNAL=-pthread;-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GTHREAD_CFLAGS_I:INTERNAL=
+GTHREAD_CFLAGS_OTHER:INTERNAL=-pthread
+GTHREAD_FOUND:INTERNAL=1
+GTHREAD_INCLUDEDIR:INTERNAL=/usr/include
+GTHREAD_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GTHREAD_LDFLAGS:INTERNAL=-lgthread-2.0;-pthread;-lglib-2.0
+GTHREAD_LDFLAGS_OTHER:INTERNAL=-pthread
+GTHREAD_LIBDIR:INTERNAL=/usr/lib/x86_64-linux-gnu
+GTHREAD_LIBRARIES:INTERNAL=gthread-2.0;glib-2.0
+GTHREAD_LIBRARY_DIRS:INTERNAL=
+GTHREAD_LIBS:INTERNAL=
+GTHREAD_LIBS_L:INTERNAL=
+GTHREAD_LIBS_OTHER:INTERNAL=
+GTHREAD_LIBS_PATHS:INTERNAL=
+GTHREAD_PREFIX:INTERNAL=/usr
+GTHREAD_STATIC_CFLAGS:INTERNAL=-pthread;-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GTHREAD_STATIC_CFLAGS_I:INTERNAL=
+GTHREAD_STATIC_CFLAGS_OTHER:INTERNAL=-pthread
+GTHREAD_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GTHREAD_STATIC_LDFLAGS:INTERNAL=-lgthread-2.0;-pthread;-lglib-2.0;-pthread;-lpcre;-pthread
+GTHREAD_STATIC_LDFLAGS_OTHER:INTERNAL=-pthread
+GTHREAD_STATIC_LIBDIR:INTERNAL=
+GTHREAD_STATIC_LIBRARIES:INTERNAL=gthread-2.0;glib-2.0;pcre
+GTHREAD_STATIC_LIBRARY_DIRS:INTERNAL=
+GTHREAD_STATIC_LIBS:INTERNAL=
+GTHREAD_STATIC_LIBS_L:INTERNAL=
+GTHREAD_STATIC_LIBS_OTHER:INTERNAL=
+GTHREAD_STATIC_LIBS_PATHS:INTERNAL=
+GTHREAD_VERSION:INTERNAL=2.58.1
+GTHREAD_gthread-2.0_INCLUDEDIR:INTERNAL=
+GTHREAD_gthread-2.0_LIBDIR:INTERNAL=
+GTHREAD_gthread-2.0_PREFIX:INTERNAL=
+GTHREAD_gthread-2.0_VERSION:INTERNAL=
+JSON_CFLAGS:INTERNAL=-pthread;-I/usr/include/json-glib-1.0;-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+JSON_CFLAGS_I:INTERNAL=
+JSON_CFLAGS_OTHER:INTERNAL=-pthread
+JSON_FOUND:INTERNAL=1
+JSON_INCLUDEDIR:INTERNAL=/usr/include
+JSON_INCLUDE_DIRS:INTERNAL=/usr/include/json-glib-1.0;/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+JSON_LDFLAGS:INTERNAL=-ljson-glib-1.0;-lgio-2.0;-lgobject-2.0;-lglib-2.0
+JSON_LDFLAGS_OTHER:INTERNAL=
+JSON_LIBDIR:INTERNAL=/usr/lib/x86_64-linux-gnu
+JSON_LIBRARIES:INTERNAL=json-glib-1.0;gio-2.0;gobject-2.0;glib-2.0
+JSON_LIBRARY_DIRS:INTERNAL=
+JSON_LIBS:INTERNAL=
+JSON_LIBS_L:INTERNAL=
+JSON_LIBS_OTHER:INTERNAL=
+JSON_LIBS_PATHS:INTERNAL=
+JSON_PREFIX:INTERNAL=/usr
+JSON_STATIC_CFLAGS:INTERNAL=-pthread;-I/usr/include/json-glib-1.0;-I/usr/include/glib-2.0;-I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+JSON_STATIC_CFLAGS_I:INTERNAL=
+JSON_STATIC_CFLAGS_OTHER:INTERNAL=-pthread
+JSON_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/json-glib-1.0;/usr/include/glib-2.0;/usr/lib/x86_64-linux-gnu/glib-2.0/include
+JSON_STATIC_LDFLAGS:INTERNAL=-ljson-glib-1.0;-lgio-2.0;-lz;-lresolv;-lselinux;-lmount;-lgmodule-2.0;-pthread;-ldl;-lgobject-2.0;-lffi;-lglib-2.0;-pthread;-lpcre;-pthread
+JSON_STATIC_LDFLAGS_OTHER:INTERNAL=-pthread
+JSON_STATIC_LIBDIR:INTERNAL=
+JSON_STATIC_LIBRARIES:INTERNAL=json-glib-1.0;gio-2.0;z;resolv;selinux;mount;gmodule-2.0;dl;gobject-2.0;ffi;glib-2.0;pcre
+JSON_STATIC_LIBRARY_DIRS:INTERNAL=
+JSON_STATIC_LIBS:INTERNAL=
+JSON_STATIC_LIBS_L:INTERNAL=
+JSON_STATIC_LIBS_OTHER:INTERNAL=
+JSON_STATIC_LIBS_PATHS:INTERNAL=
+JSON_VERSION:INTERNAL=1.4.4
+JSON_json-glib-1.0_INCLUDEDIR:INTERNAL=
+JSON_json-glib-1.0_LIBDIR:INTERNAL=
+JSON_json-glib-1.0_PREFIX:INTERNAL=
+JSON_json-glib-1.0_VERSION:INTERNAL=
+//ADVANCED property for variable: PKG_CONFIG_EXECUTABLE
+PKG_CONFIG_EXECUTABLE-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: VALA_EXECUTABLE
 VALA_EXECUTABLE-ADVANCED:INTERNAL=1
+__pkg_config_arguments_GEE:INTERNAL=REQUIRED;gee-0.8
+__pkg_config_arguments_GIO:INTERNAL=REQUIRED;gio-2.0
+__pkg_config_arguments_GOBJECT:INTERNAL=REQUIRED;gobject-2.0
+__pkg_config_arguments_GTHREAD:INTERNAL=REQUIRED;gthread-2.0
+__pkg_config_arguments_JSON:INTERNAL=REQUIRED;json-glib-1.0
+__pkg_config_checked_GEE:INTERNAL=1
+__pkg_config_checked_GIO:INTERNAL=1
+__pkg_config_checked_GIO_PKG:INTERNAL=1
+__pkg_config_checked_GLIB_PKG:INTERNAL=1
+__pkg_config_checked_GOBJECT:INTERNAL=1
+__pkg_config_checked_GOBJECT_PKG:INTERNAL=1
+__pkg_config_checked_GTHREAD:INTERNAL=1
+__pkg_config_checked_JSON:INTERNAL=1
+prefix_result:INTERNAL=/usr/lib/x86_64-linux-gnu
 
index 375f2e5..e0e14b9 100644 (file)
@@ -202,3 +202,18 @@ make[1]: Leaving directory '/home/alan/gitlive/roojspacker/CMakeFiles/CMakeTmp'
     Feature record: C_FEATURE:0c_restrict
     Feature record: C_FEATURE:0c_static_assert
     Feature record: C_FEATURE:0c_variadic_macros
+Performing C SOURCE FILE Test CFLAG_Wincompatible_pointer_types succeeded with the following output:
+Change Dir: /home/alan/gitlive/roojspacker/CMakeFiles/CMakeTmp
+
+Run Build Command:"/usr/bin/make" "cmTC_6d44e/fast"
+/usr/bin/make -f CMakeFiles/cmTC_6d44e.dir/build.make CMakeFiles/cmTC_6d44e.dir/build
+make[1]: Entering directory '/home/alan/gitlive/roojspacker/CMakeFiles/CMakeTmp'
+Building C object CMakeFiles/cmTC_6d44e.dir/src.c.o
+/usr/bin/cc   -DCFLAG_Wincompatible_pointer_types   -Wall -Wextra -Werror -Wincompatible-pointer-types -o CMakeFiles/cmTC_6d44e.dir/src.c.o   -c /home/alan/gitlive/roojspacker/CMakeFiles/CMakeTmp/src.c
+Linking C executable cmTC_6d44e
+/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_6d44e.dir/link.txt --verbose=1
+/usr/bin/cc  -DCFLAG_Wincompatible_pointer_types    -rdynamic CMakeFiles/cmTC_6d44e.dir/src.c.o  -o cmTC_6d44e 
+make[1]: Leaving directory '/home/alan/gitlive/roojspacker/CMakeFiles/CMakeTmp'
+
+Source file was:
+int main(void) { return 0; }
index a0c6cc8..7677977 100644 (file)
@@ -4,11 +4,9 @@ cmake_minimum_required(VERSION 3.2)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
-include(FindVala)
-include(AddCompilerFlags)
-
 find_package(GLib "2.38" REQUIRED) 
-find_package(Vala "0.36.0" MINIMUM)
+find_package(Vala "0.36.0" REQUIRED)
 
    
 
@@ -36,10 +34,20 @@ if(CMAKE_BUILD_TYPE STREQUAL "")
   set(CMAKE_BUILD_TYPE "Debug")
 endif(CMAKE_BUILD_TYPE STREQUAL "")
 
-list(APPEND VALA_COMPILER_FLAGS "--target-glib=2.38")
+list(APPEND VALA_COMPILER_FLAGS
+        "--target-glib=2.38"
+        "-g"
+        "-X -shared"
+        "-X -lm"
+        "--thread"
+        "--vapidir=${CMAKE_SOURCE_DIR}/vapi"
+)
 list(APPEND VALA_COMPILER_FLAGs_DEBUG "--debug")
 
 
+
+include(AddCompilerFlags)
+
 global_add_compiler_flags(-Wno-incompatible-pointer-types)
 
 
@@ -66,4 +74,4 @@ set (LIBRARY_PATH "src")
 
   
 add_subdirectory(src)
-add_subdirectory(main)
\ No newline at end of file
+add_subdirectory(bin)
\ No newline at end of file
index e69de29..1213561 100644 (file)
@@ -0,0 +1,257 @@
+# FindGLib.cmake
+# <https://github.com/nemequ/gnome-cmake>
+#
+# CMake support for GLib/GObject/GIO.
+#
+# License:
+#
+#   Copyright (c) 2016 Evan Nemerson <evan@nemerson.com>
+#
+#   Permission is hereby granted, free of charge, to any person
+#   obtaining a copy of this software and associated documentation
+#   files (the "Software"), to deal in the Software without
+#   restriction, including without limitation the rights to use, copy,
+#   modify, merge, publish, distribute, sublicense, and/or sell copies
+#   of the Software, and to permit persons to whom the Software is
+#   furnished to do so, subject to the following conditions:
+#
+#   The above copyright notice and this permission notice shall be
+#   included in all copies or substantial portions of the Software.
+#
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+#   DEALINGS IN THE SOFTWARE.
+
+find_package(PkgConfig)
+
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(GLIB_PKG    glib-2.0)
+  pkg_search_module(GOBJECT_PKG gobject-2.0)
+  pkg_search_module(GIO_PKG     gio-2.0)
+endif()
+
+find_library(GLIB    glib-2.0    HINTS ${GLIB_PKG_LIBRARY_DIRS})
+find_library(GOBJECT gobject-2.0 HINTS ${GOBJECT_PKG_LIBRARY_DIRS})
+find_library(GIO     gio-2.0     HINTS ${GIO_PKG_LIBRARY_DIRS})
+
+if(GLIB)
+  add_library(glib-2.0 SHARED IMPORTED)
+  set_property(TARGET glib-2.0 PROPERTY IMPORTED_LOCATION "${GLIB}")
+
+  find_path(GLIB_INCLUDE_DIRS "glib.h"
+    HINTS ${GLIB_PKG_INCLUDE_DIRS}
+    PATH_SUFFIXES "glib-2.0")
+
+  get_filename_component(GLIB_LIBDIR "${GLIB}" DIRECTORY)
+  find_path(GLIB_CONFIG_INCLUDE_DIR "glibconfig.h"
+    HINTS
+      ${GLIB_LIBDIR}
+      ${GLIB_PKG_INCLUDE_DIRS}
+    PATHS
+      "${CMAKE_LIBRARY_PATH}"
+    PATH_SUFFIXES
+      "glib-2.0/include"
+      "glib-2.0")
+  unset(GLIB_LIBDIR)
+
+  if(NOT GLIB_CONFIG_INCLUDE_DIR)
+    unset(GLIB_INCLUDE_DIRS)
+  else()
+    file(STRINGS "${GLIB_CONFIG_INCLUDE_DIR}/glibconfig.h" GLIB_MAJOR_VERSION REGEX "^#define GLIB_MAJOR_VERSION +([0-9]+)")
+    string(REGEX REPLACE "^#define GLIB_MAJOR_VERSION ([0-9]+)$" "\\1" GLIB_MAJOR_VERSION "${GLIB_MAJOR_VERSION}")
+    file(STRINGS "${GLIB_CONFIG_INCLUDE_DIR}/glibconfig.h" GLIB_MINOR_VERSION REGEX "^#define GLIB_MINOR_VERSION +([0-9]+)")
+    string(REGEX REPLACE "^#define GLIB_MINOR_VERSION ([0-9]+)$" "\\1" GLIB_MINOR_VERSION "${GLIB_MINOR_VERSION}")
+    file(STRINGS "${GLIB_CONFIG_INCLUDE_DIR}/glibconfig.h" GLIB_MICRO_VERSION REGEX "^#define GLIB_MICRO_VERSION +([0-9]+)")
+    string(REGEX REPLACE "^#define GLIB_MICRO_VERSION ([0-9]+)$" "\\1" GLIB_MICRO_VERSION "${GLIB_MICRO_VERSION}")
+    set(GLIB_VERSION "${GLIB_MAJOR_VERSION}.${GLIB_MINOR_VERSION}.${GLIB_MICRO_VERSION}")
+    unset(GLIB_MAJOR_VERSION)
+    unset(GLIB_MINOR_VERSION)
+    unset(GLIB_MICRO_VERSION)
+
+    list(APPEND GLIB_INCLUDE_DIRS ${GLIB_CONFIG_INCLUDE_DIR})
+  endif()
+endif()
+
+if(GOBJECT)
+  add_library(gobject-2.0 SHARED IMPORTED)
+  set_property(TARGET gobject-2.0 PROPERTY IMPORTED_LOCATION "${GOBJECT}")
+
+  find_path(GOBJECT_INCLUDE_DIRS "glib-object.h"
+    HINTS ${GOBJECT_PKG_INCLUDE_DIRS}
+    PATH_SUFFIXES "glib-2.0")
+  if(GOBJECT_INCLUDE_DIRS)
+    list(APPEND GOBJECT_INCLUDE_DIRS ${GLIB_INCLUDE_DIRS})
+    list(REMOVE_DUPLICATES GOBJECT_INCLUDE_DIRS)
+  endif()
+endif()
+
+if(GIO)
+  add_library(gio-2.0 SHARED IMPORTED)
+  set_property(TARGET gio-2.0 PROPERTY IMPORTED_LOCATION "${GIO}")
+
+  find_path(GIO_INCLUDE_DIRS "gio/gio.h"
+    HINTS ${GIO_PKG_INCLUDE_DIRS}
+    PATH_SUFFIXES "glib-2.0")
+  if(GIO_INCLUDE_DIRS)
+    list(APPEND GIO_INCLUDE_DIRS ${GOBJECT_INCLUDE_DIRS})
+    list(REMOVE_DUPLICATES GIO_INCLUDE_DIRS)
+  endif()
+endif()
+
+find_program(GLIB_GENMARSHAL glib-genmarshal)
+if(GLIB_GENMARSHAL)
+  add_executable(glib-genmarshal IMPORTED)
+  set_property(TARGET glib-genmarshal PROPERTY IMPORTED_LOCATION "${GLIB_GENMARSHAL}")
+endif()
+
+find_program(GLIB_MKENUMS glib-mkenums)
+if(GLIB_MKENUMS)
+  add_executable(glib-mkenums IMPORTED)
+  set_property(TARGET glib-mkenums PROPERTY IMPORTED_LOCATION "${GLIB_MKENUMS}")
+endif()
+
+find_program(GLIB_COMPILE_SCHEMAS glib-compile-schemas)
+if(GLIB_COMPILE_SCHEMAS)
+  add_executable(glib-compile-schemas IMPORTED)
+  set_property(TARGET glib-compile-schemas PROPERTY IMPORTED_LOCATION "${GLIB_COMPILE_SCHEMAS}")
+endif()
+
+# glib_install_schemas(
+#   [DESTINATION directory]
+#   schemas…)
+#
+# Validate and install the listed schemas.
+function(glib_install_schemas)
+  set (options)
+  set (oneValueArgs DESTINATION)
+  set (multiValueArgs)
+  cmake_parse_arguments(GSCHEMA "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+  unset (options)
+  unset (oneValueArgs)
+  unset (multiValueArgs)
+
+  foreach(schema ${GSCHEMA_UNPARSED_ARGUMENTS})
+    get_filename_component(schema_name "${schema}" NAME)
+    string(REGEX REPLACE "^(.+)\.gschema.xml$" "\\1" schema_name "${schema_name}")
+    set(schema_output "${CMAKE_CURRENT_BINARY_DIR}/${schema_name}.gschema.xml.valid")
+
+    add_custom_command(
+      OUTPUT "${schema_output}"
+      COMMAND glib-compile-schemas
+        --strict
+        --dry-run
+        --schema-file="${schema}"
+      COMMAND "${CMAKE_COMMAND}" ARGS -E touch "${schema_output}"
+      DEPENDS "${schema}"
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+      COMMENT "Validating ${schema}")
+
+    add_custom_target("gsettings-schema-${schema_name}" ALL
+      DEPENDS "${schema_output}")
+
+    if(CMAKE_INSTALL_FULL_DATADIR)
+      set(SCHEMADIR "${CMAKE_INSTALL_FULL_DATADIR}/glib-2.0/schemas")
+    else()
+      set(SCHEMADIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas")
+    endif()
+    install(FILES "${schema}"
+      DESTINATION "${SCHEMADIR}")
+    install(CODE "execute_process(COMMAND \"${GLIB_COMPILE_SCHEMAS}\" \"${SCHEMADIR}\")")
+  endforeach()
+endfunction()
+
+find_program(GLIB_COMPILE_RESOURCES glib-compile-resources)
+if(GLIB_COMPILE_RESOURCES)
+  add_executable(glib-compile-resources IMPORTED)
+  set_property(TARGET glib-compile-resources PROPERTY IMPORTED_LOCATION "${GLIB_COMPILE_RESOURCES}")
+endif()
+
+function(glib_compile_resources SPEC_FILE)
+  set (options INTERNAL)
+  set (oneValueArgs TARGET SOURCE_DIR HEADER SOURCE C_NAME)
+  set (multiValueArgs)
+  cmake_parse_arguments(GLIB_COMPILE_RESOURCES "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+  unset (options)
+  unset (oneValueArgs)
+  unset (multiValueArgs)
+
+  if(NOT GLIB_COMPILE_RESOURCES_SOURCE_DIR)
+    set(GLIB_COMPILE_RESOURCES_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+  endif()
+
+  set(FLAGS)
+
+  if(GLIB_COMPILE_RESOURCES_INTERNAL)
+    list(APPEND FLAGS "--internal")
+  endif()
+
+  if(GLIB_COMPILE_RESOURCES_C_NAME)
+    list(APPEND FLAGS "--c-name" "${GLIB_COMPILE_RESOURCES_C_NAME}")
+  endif()
+
+  get_filename_component(SPEC_FILE "${SPEC_FILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+
+  execute_process(
+    COMMAND glib-compile-resources
+      --generate-dependencies
+      --sourcedir "${GLIB_COMPILE_RESOURCES_SOURCE_DIR}"
+      "${SPEC_FILE}"
+    OUTPUT_VARIABLE deps
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  if(GLIB_COMPILE_RESOURCES_HEADER)
+    get_filename_component(GLIB_COMPILE_RESOURCES_HEADER "${GLIB_COMPILE_RESOURCES_HEADER}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+
+    add_custom_command(
+      OUTPUT "${GLIB_COMPILE_RESOURCES_HEADER}"
+      COMMAND glib-compile-resources
+        --sourcedir "${GLIB_COMPILE_RESOURCES_SOURCE_DIR}"
+        --generate-header
+        --target "${GLIB_COMPILE_RESOURCES_HEADER}"
+        ${FLAGS}
+        "${SPEC_FILE}"
+      DEPENDS "${SPEC_FILE}" ${deps}
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+  endif()
+
+  if(GLIB_COMPILE_RESOURCES_SOURCE)
+    get_filename_component(GLIB_COMPILE_RESOURCES_SOURCE "${GLIB_COMPILE_RESOURCES_SOURCE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+
+    add_custom_command(
+      OUTPUT "${GLIB_COMPILE_RESOURCES_SOURCE}"
+      COMMAND glib-compile-resources
+        --sourcedir "${GLIB_COMPILE_RESOURCES_SOURCE_DIR}"
+        --generate-source
+        --target "${GLIB_COMPILE_RESOURCES_SOURCE}"
+        ${FLAGS}
+        "${SPEC_FILE}"
+      DEPENDS "${SPEC_FILE}" ${deps}
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+  endif()
+endfunction()
+
+find_program(GDBUS_CODEGEN gdbus-codegen)
+if(GDBUS_CODEGEN)
+  add_executable(gdbus-codegen IMPORTED)
+  set_property(TARGET gdbus-codegen PROPERTY IMPORTED_LOCATION "${GDBUS_CODEGEN}")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLib
+    REQUIRED_VARS
+      GLIB_INCLUDE_DIRS
+      GOBJECT_INCLUDE_DIRS
+      GIO_INCLUDE_DIRS
+      GLIB_MKENUMS
+      GLIB_GENMARSHAL
+      GLIB_COMPILE_SCHEMAS
+      GLIB_COMPILE_RESOURCES
+      GDBUS_CODEGEN
+    VERSION_VAR
+      GLIB_VERSION)
\ No newline at end of file
diff --git a/cmake/vala/FindVala.cmake b/cmake/vala/FindVala.cmake
deleted file mode 100644 (file)
index aaec9c5..0000000
+++ /dev/null
@@ -1,409 +0,0 @@
-# FindVala.cmake
-# <https://github.com/nemequ/gnome-cmake>
-#
-# This file contains functions which can be used to integrate Vala
-# compilation with CMake.  It is intended as a replacement for Jakob
-# Westhoff's FindVala.cmake and UseVala.cmake.  It uses fast-vapis for
-# faster parallel compilation, and per-target directories for
-# generated sources to allow reusing source files across, even with
-# different options.
-#
-# License:
-#
-#   Copyright (c) 2016 Evan Nemerson <evan@nemerson.com>
-#
-#   Permission is hereby granted, free of charge, to any person
-#   obtaining a copy of this software and associated documentation
-#   files (the "Software"), to deal in the Software without
-#   restriction, including without limitation the rights to use, copy,
-#   modify, merge, publish, distribute, sublicense, and/or sell copies
-#   of the Software, and to permit persons to whom the Software is
-#   furnished to do so, subject to the following conditions:
-#
-#   The above copyright notice and this permission notice shall be
-#   included in all copies or substantial portions of the Software.
-#
-#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-#   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-#   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-#   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-#   DEALINGS IN THE SOFTWARE.
-
-set(VALAC_NAMES valac)
-
-set(_FIND_VALA_CURRENT_VERSION 98)
-while(_FIND_VALA_CURRENT_VERSION GREATER 0)
-  list(APPEND VALAC_NAME "valac-1.${_FIND_VALA_CURRENT_VERSION}")
-  math(EXPR _FIND_VALA_CURRENT_VERSION "${_FIND_VALA_CURRENT_VERSION} - 2")
-endwhile()
-set(_FIND_VALA_CURRENT_VERSION 98)
-while(_FIND_VALA_CURRENT_VERSION GREATER 0)
-  list(APPEND VALAC_NAME "valac-1.${_FIND_VALA_CURRENT_VERSION}")
-  math(EXPR _FIND_VALA_CURRENT_VERSION "${_FIND_VALA_CURRENT_VERSION} - 2")
-endwhile()
-unset(_FIND_VALA_CURRENT_VERSION)
-
-find_program(VALA_EXECUTABLE
-  NAMES ${VALAC_NAMES})
-mark_as_advanced(VALA_EXECUTABLE)
-
-unset(VALAC_NAMES)
-
-if(VALA_EXECUTABLE)
-  # Determine valac version
-  execute_process(COMMAND ${VALA_EXECUTABLE} "--version"
-    OUTPUT_VARIABLE VALA_VERSION)
-  string(REGEX REPLACE "^.*Vala ([0-9]+\\.[0-9]+\\.[0-9]+(\\.[0-9]+(\\-[0-9a-f]+)?)?).*$" "\\1" VALA_VERSION "${VALA_VERSION}")
-
-  add_executable(valac IMPORTED)
-  set_property(TARGET valac PROPERTY IMPORTED_LOCATION "${VALA_EXECUTABLE}")
-endif(VALA_EXECUTABLE)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Vala
-    REQUIRED_VARS VALA_EXECUTABLE
-    VERSION_VAR VALA_VERSION)
-
-function(_vala_mkdir_for_file file)
-  get_filename_component(dir "${file}" DIRECTORY)
-  file(MAKE_DIRECTORY "${dir}")
-endfunction()
-
-macro(_vala_parse_source_file_path source)
-  set (options)
-  set (oneValueArgs SOURCE TYPE OUTPUT_PATH OUTPUT_DIR GENERATED_SOURCE FAST_VAPI)
-  set (multiValueArgs)
-  cmake_parse_arguments(VALAPATH "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-  unset (options)
-  unset (oneValueArgs)
-  unset (multiValueArgs)
-
-  if(VALAPATH_SOURCE)
-    get_filename_component("${VALAPATH_SOURCE}" "${source}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-  endif()
-
-  if(VALAPATH_TYPE)
-    string(REGEX MATCH "[^\\.]+$" "${VALAPATH_TYPE}" "${source}")
-    string(TOLOWER "${${VALAPATH_TYPE}}" "${VALAPATH_TYPE}")
-  endif()
-
-  if(VALAPATH_OUTPUT_PATH OR VALAPATH_GENERATED_SOURCE OR VALAPATH_OUTPUT_DIR OR VALAPATH_FAST_VAPI)
-    get_filename_component(srcfile "${source}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-
-    string(LENGTH "${CMAKE_BINARY_DIR}" dirlen)
-    string(SUBSTRING "${srcfile}" 0 ${dirlen} tmp)
-    if("${CMAKE_BINARY_DIR}" STREQUAL "${tmp}")
-      string(SUBSTRING "${srcfile}" ${dirlen} -1 tmp)
-      set(outpath "build${tmp}")
-    else()
-      string(LENGTH "${CMAKE_SOURCE_DIR}" dirlen)
-      string(SUBSTRING "${srcfile}" 0 ${dirlen} tmp)
-      if("${CMAKE_SOURCE_DIR}" STREQUAL "${tmp}")
-        string(SUBSTRING "${srcfile}" ${dirlen} -1 tmp)
-        set(outpath "source${tmp}")
-      else ()
-        # TODO: this probably doesn't work correctly on Windows…
-        set(outpath "root${tmp}")
-      endif()
-    endif()
-
-    unset(tmp)
-    unset(dirlen)
-    unset(srcfile)
-  endif()
-
-  if(VALAPATH_OUTPUT_PATH)
-    set("${VALAPATH_OUTPUT_PATH}" "${outpath}")
-  endif()
-
-  if(VALAPATH_GENERATED_SOURCE)
-    string(REGEX REPLACE "\\.(vala|gs)$" ".c" "${VALAPATH_GENERATED_SOURCE}" "${outpath}")
-  endif()
-
-  if(VALAPATH_FAST_VAPI)
-    string(REGEX REPLACE "\\.(vala|gs)$" ".vapi" "${VALAPATH_FAST_VAPI}" "${outpath}")
-  endif()
-
-  if(VALAPATH_OUTPUT_DIR)
-    get_filename_component("${VALAPATH_OUTPUT_DIR}" "${outpath}" DIRECTORY)
-  endif()
-
-  unset(outpath)
-endmacro()
-
-# vala_precompile_target(
-#   TARGET
-#   GENERATED_SOURCES
-#   SOURCES…
-#   [VAPI vapi-name.vapi]
-#   [GIR name-version.gir]
-#   [HEADER name.h]
-#   [FLAGS …]
-#   [PACKAGES …]
-#   [DEPENDS …])
-#
-# This function will use valac to generate C code.
-#
-# This function uses fast VAPIs to help improve parallelization and
-# incremental build times.  The problem with this is that CMake
-# doesn't allow file-level dependencies across directories; if you're
-# generating code in one directory (for example, a library) and would
-# like to use it in another directory and are building in parallel,
-# the build can fail.  To prevent this, this function will create a
-# ${TARGET}-vala top-level target (which *is* usable from other
-# directories).
-#
-# Options:
-#
-#   TARGET
-#     Target to create; it's generally best to make this similar to
-#     your executable or library target name (e.g., for a "foo"
-#     executable, "foo-vala" might be a good name), but not
-#     technically required.
-#   GENERATED_SOURCES
-#     Variable in which to store the list of generated sources (which
-#     you should pass to add_executable or add_library).
-#   SOURCES
-#     Vala sources to generate C from.  You should include *.vala,
-#     *.gs, and uninstalled *.vapi files here; you may also include
-#     C/C++ sources (they will simply be passed directly through to
-#     the GENERATED_SOURCES variable).
-#   VAPI name.vapi
-#     If you would like to have valac generate a VAPI (basically, if
-#     you are generating a library not an executable), pass the file
-#     name here.
-#   GIR name-version.gir
-#     If you would like to have valac generate a GIR, pass the file
-#     name here.
-#   HEADER name.h
-#     If you would like to have valac generate a C header, pass the
-#     file name here.
-#   FLAGS …
-#     List of flags you wish to pass to valac.  They will be added to
-#     the flags in VALA_COMPILER_FLAGS and VALA_COMPILER_FLAGS_DEBUG
-#     (for Debug builds) or VALA_COMPILER_FLAGS_RELEASE (for Release
-#     builds).
-#   PACKAGES
-#     List of dependencies to pass to valac.
-#   DEPENDS
-#     Any additional dependencies you would like.
-macro(vala_precompile_target TARGET GENERATED_SOURCES)
-  set (options)
-  set (oneValueArgs VAPI GIR HEADER)
-  set (multiValueArgs FLAGS PACKAGES DEPENDS)
-  cmake_parse_arguments(VALAC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-  unset (options)
-  unset (oneValueArgs)
-  unset (multiValueArgs)
-
-  set(VALA_SOURCES)
-  set(VALA_VAPIS)
-  set(VALA_OUTPUT_SOURCES)
-
-  if(VALAC_VAPI)
-    list(APPEND non_source_out_files "${VALAC_VAPI}")
-    list(APPEND non_source_valac_args "--vapi" "${VALAC_VAPI}")
-  endif()
-
-  if(VALAC_GIR)
-    list(APPEND non_source_out_files "${VALAC_GIR}")
-    list(APPEND non_source_valac_args
-      "--gir" "${VALAC_GIR}"
-      "--library" "${TARGET}"
-      "--shared-library" "${CMAKE_SHARED_LIBRARY_PREFIX}${TARGET}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-  endif()
-
-  if(VALAC_HEADER)
-    list(APPEND non_source_out_files "${VALAC_HEADER}")
-    list(APPEND non_source_valac_args --header "${VALAC_HEADER}")
-  endif()
-
-  # Split up the input files into three lists; one containing vala and
-  # genie sources, one containing VAPIs, and one containing C files
-  # (which may seem a bit silly, but it does open up the possibility
-  # of declaring your source file list once instead of having separate
-  # lists for Vala and C).
-  foreach(source ${VALAC_UNPARSED_ARGUMENTS})
-    _vala_parse_source_file_path("${source}"
-      SOURCE source_full
-      TYPE type)
-
-    if("vala" STREQUAL "${type}" OR "gs" STREQUAL "${type}")
-      list(APPEND VALA_SOURCES "${source_full}")
-    elseif("vapi" STREQUAL "${type}")
-      list(APPEND VALA_VAPIS "${source_full}")
-    elseif(
-        "c"   STREQUAL "${type}" OR
-        "h"   STREQUAL "${type}" OR
-        "cpp" STREQUAL "${type}" OR
-        "cxx" STREQUAL "${type}" OR
-        "hpp" STREQUAL "${type}")
-      list(APPEND VALA_OUTPUT_SOURCES "${source_full}")
-    endif()
-
-    unset(type)
-    unset(source_full)
-  endforeach()
-
-  # Set the common flags to pass to every valac invocation.
-  set(VALAFLAGS ${VALAC_FLAGS} ${VALA_VAPIS})
-  foreach(pkg ${VALAC_PACKAGES})
-    list(APPEND VALAFLAGS "--pkg" "${pkg}")
-  endforeach()
-  list(APPEND VALAFLAGS ${VALA_COMPILER_FLAGS})
-  if (CMAKE_BUILD_TYPE MATCHES "Debug")
-    list(APPEND VALAFLAGS ${VALA_COMPILER_FLAGS_DEBUG})
-  elseif(CMAKE_BUILD_TYPE MATCHES "Release")
-    list(APPEND VALAFLAGS ${VALA_COMPILER_FLAGS_RELEASE})
-  endif()
-
-  # Where to put the output
-  set(TARGET_DIR "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}")
-
-  set(FAST_VAPI_STAMPS)
-
-  # Create fast VAPI targets for each vala source
-  foreach(source ${VALA_SOURCES})
-    _vala_parse_source_file_path("${source}"
-      FAST_VAPI fast_vapi_path)
-
-    # We need somewhere to put the output…
-    _vala_mkdir_for_file("${TARGET_DIR}/${fast_vapi_path}")
-
-    # Create the target
-    add_custom_command(
-      OUTPUT "${TARGET_DIR}/${fast_vapi_path}.stamp"
-      BYPRODUCTS "${TARGET_DIR}/${fast_vapi_path}"
-      DEPENDS
-        "${source}"
-        ${VALA_VAPIS}
-        ${VALAC_DEPENDS}
-      COMMAND "${VALA_EXECUTABLE}"
-      ARGS
-        "${source}"
-        --fast-vapi "${TARGET_DIR}/${fast_vapi_path}"
-        ${VALAFLAGS}
-      COMMAND "${CMAKE_COMMAND}" ARGS -E touch "${TARGET_DIR}/${fast_vapi_path}.stamp"
-      COMMENT "Generating fast VAPI ${TARGET_DIR}/${fast_vapi_path}")
-
-    list(APPEND FAST_VAPI_STAMPS "${TARGET_DIR}/${fast_vapi_path}.stamp")
-
-    unset(fast_vapi_path)
-  endforeach()
-
-  # Create a ${TARGET_DIR}-fast-vapis target which depens on all the fast
-  # vapi stamps.  We can use this as a dependency to make sure all
-  # fast-vapis are up to date.
-  add_custom_command(
-    OUTPUT "${TARGET_DIR}/fast-vapis.stamp"
-    COMMAND "${CMAKE_COMMAND}" ARGS -E touch "${TARGET_DIR}/fast-vapis.stamp"
-    DEPENDS
-      ${FAST_VAPI_STAMPS}
-      ${VALAC_DEPENDS}
-    COMMENT "Generating fast VAPIs for ${TARGET}")
-
-  add_custom_target("${TARGET}-fast-vapis"
-    DEPENDS "${TARGET_DIR}/fast-vapis.stamp")
-
-  set(VALA_GENERATED_SOURCE_STAMPS)
-
-  # Add targets to generate C sources
-  foreach(source ${VALA_SOURCES})
-    _vala_parse_source_file_path("${source}"
-      OUTPUT_PATH output_path
-      OUTPUT_DIR output_dir
-      GENERATED_SOURCE generated_source)
-
-    set(use_fast_vapi_flags)
-    foreach(src ${VALA_SOURCES})
-      if(NOT "${src}" STREQUAL "${source}")
-        _vala_parse_source_file_path("${src}"
-          FAST_VAPI src_fast_vapi_path)
-
-        list(APPEND use_fast_vapi_flags --use-fast-vapi "${TARGET_DIR}/${src_fast_vapi_path}")
-
-        unset(src_fast_vapi_path)
-      endif()
-    endforeach()
-
-    add_custom_command(
-      OUTPUT "${TARGET_DIR}/${generated_source}.stamp"
-      BYPRODUCTS "${TARGET_DIR}/${generated_source}"
-      COMMAND "${VALA_EXECUTABLE}"
-      ARGS
-        -d "${TARGET_DIR}/${output_dir}"
-        -C
-        "${source}"
-        ${VALAFLAGS}
-        ${use_fast_vapi_flags}
-      COMMAND "${CMAKE_COMMAND}" ARGS -E touch "${TARGET_DIR}/${generated_source}.stamp"
-      DEPENDS
-        "${TARGET}-fast-vapis"
-        "${source}"
-        ${VALA_VAPIS}
-      COMMENT "Generating ${TARGET_DIR}/${generated_source}")
-    unset(use_fast_vapi_flags)
-
-    list(APPEND VALA_OUTPUT_SOURCES "${TARGET_DIR}/${generated_source}")
-    list(APPEND VALA_GENERATED_SOURCE_STAMPS "${TARGET_DIR}/${generated_source}.stamp")
-
-    unset(fast_vapi_path)
-    unset(output_dir)
-    unset(generated_source)
-  endforeach()
-
-  add_custom_command(
-    OUTPUT "${TARGET_DIR}/stamp"
-    COMMAND "${CMAKE_COMMAND}" ARGS -E touch "${TARGET_DIR}/stamp"
-    DEPENDS ${VALA_GENERATED_SOURCE_STAMPS}
-    COMMENT "Generating sources from Vala for ${TARGET}")
-
-  set("${GENERATED_SOURCES}" ${VALA_OUTPUT_SOURCES})
-
-  if(non_source_out_files)
-    set(use_fast_vapi_flags)
-    foreach(source ${VALA_SOURCES})
-      _vala_parse_source_file_path("${source}"
-        FAST_VAPI fast_vapi_path)
-
-      list(APPEND use_fast_vapi_flags --use-fast-vapi "${TARGET_DIR}/${fast_vapi_path}")
-
-      unset(fast_vapi_path)
-    endforeach()
-
-    add_custom_command(OUTPUT ${non_source_out_files}
-      COMMAND ${VALA_EXECUTABLE}
-      ARGS
-        -C
-        ${non_source_valac_args}
-        ${VALAFLAGS}
-        ${use_fast_vapi_flags}
-      DEPENDS
-        "${TARGET}-fast-vapis"
-        ${VALA_VAPIS})
-    unset(use_fast_vapi_flags)
-  endif()
-
-  # CMake doesn't allow file-level dependencies across directories, so
-  # we provide a target we can depend on from other directories.
-  add_custom_target("${TARGET}"
-    DEPENDS
-      "${TARGET_DIR}/stamp"
-      ${non_source_out_files}
-      ${VALAC_DEPENDS}
-      ${VALA_GENERATED_SOURCE_STAMPS})
-
-  unset(non_source_out_files)
-  unset(non_source_valac_args)
-
-  unset(VALA_GENERATED_SOURCE_STAMPS)
-  unset(FAST_VAPI_STAMPS)
-  unset(TARGET_DIR)
-  unset(VALAFLAGS)
-  unset(VALA_SOURCES)
-  unset(VALA_VAPIS)
-  unset(VALA_OUTPUT_SOURCES)
-endmacro()
\ No newline at end of file
index fc27805..955bb53 100644 (file)
@@ -34,37 +34,38 @@ endmacro(make_compile_directory)
 
 ## ----------- the library
 
-vala_precompile(VALA_C
-       ${VALA_SRC}
+vala_precompile_target(
+        "libroojspacker-vala"
+       VALA_C
 PACKAGES 
        gio-2.0
        gee-0.8
         glib-2.0
         gobject-2.0
         json-glib-1.0
-OPTIONS 
-       --thread
-       --debug
-        --vapidir=${CMAKE_SOURCE_DIR}/vapi
-        -g
-        -X -shared -X -lm
-        --target-glib=2.32
-GENERATE_HEADER
-       roojspacker-1.2.h
-GENERATE_VAPI
-       roojspacker-1.2
+HEADER roojspacker-1.2.h
+VAPI roojspacker-1.2
+    ${VALA_SRC}
 )
 
-add_library(libroojspacker-1.2 
+add_library(libroojspacker 
        SHARED
-       EXCLUDE_FROM_ALL
        ${VALA_C} roojspacker.h
 )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/roojspacker-1.2.vapi
+
+add_dependencies("libroojspacker" "libroojspacker-vala")
+
+# Set the library's version information
+set_target_properties (${MY_PROJECT_LIBRARY_NAME} PROPERTIES
+    SOVERSION "1.2.1000"
+    VERSION   "1.2")
+
+
+# Install our VAPI
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/roojspacker.vapi
     DESTINATION ${CMAKE_INSTALL_DATADIR}/vala/vapi)
     
-install (TARGETS libroojspacker-1.2
+install (TARGETS "libroojspacker-1.2"
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}  # On Windows, the DLL goes in the same place as the executables
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}  # This is where shared libraries (*.so on Linux, *.dynlib on OS X)
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) # Finally, this is where static libraries (*.a) go
@@ -73,54 +74,13 @@ install (TARGETS libroojspacker-1.2
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/roojspacker-1.2.h
     DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 
-# Install our VAPI
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/roojspacker-1.2.vapi
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/vala/vapi)
-    
+# pkg-config file..    
 configure_file (
-    "${CMAKE_CURRENT_SOURCE_DIR}/roojspacker-1.2.pc.in"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../roojspacker-1.2.pc.in"
     "${CMAKE_CURRENT_BINARY_DIR}/roojspacker-1.2.pc"
     @ONLY)
     
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/roojspacker-1.2.pc
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-    
-## ----------- the binary
-
-vala_precompile(VALABIN_C
-       main.vala
-PACKAGES 
-       gio-2.0
-       gee-0.8
-        glib-2.0
-        gobject-2.0
-        json-glib-1.0
-        roojspacker-1.2
-OPTIONS 
-       --thread
-       --debug
-        --vapidir=${CMAKE_SOURCE_DIR}/vapi
-        --vapidir=${CMAKE_SOURCE_DIR}
-        -g
-        -X -shared -X -lm
-        --target-glib=2.32
-)
-
-
-
-add_executable(roojspacker
-       ${VALABIN_C}
-)
-
-# explicitly add libraries (needed e.g. for Fedora 13+)
-# target_link_libraries(roojspacker -lm)
-
-install(TARGETS 
-       roojspacker
-RUNTIME
-DESTINATION
-       bin
-)
-
-
+     
diff --git a/src/main.vala b/src/main.vala
deleted file mode 100644 (file)
index 8162696..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-public static int main(string[] args) 
-{
-       //foreach(var a in args) {
-       //      debug("ARG: %s\n", a);
-       //}
-       
-
-
-       var pr =   JSDOC.PackerRun.singleton( );
-       pr.parseArgs(args);
-       pr.runPack();
-       
-       return 0;
-}
\ No newline at end of file