CMakeLists.txt

@@ -1,25 +1,28 @@
-cmake_minimum_required (VERSION 3.0)
+project (wdmtg C)
-project (wdmtg VERSION 0.1.0 LANGUAGES C)
+cmake_minimum_required (VERSION 2.8.12)
 
 # Vala really sucks at producing good C code
 if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
 	set (CMAKE_C_FLAGS_RELEASE
 		"${CMAKE_C_FLAGS_RELEASE} -Wno-ignored-qualifiers -Wno-incompatible-pointer-types")
-endif ()
+endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
 
 # Options
 option (OPTION_NOINSTALL "Only for developers; work without installing" OFF)
 
+# Version
+set (project_VERSION "0.1.0")
+
 # Set some variables
 if (OPTION_NOINSTALL)
 	set (project_SHARE_DIR ${PROJECT_SOURCE_DIR}/share)
 elseif (WIN32)
 	set (project_SHARE_DIR ../share)
 	set (project_INSTALL_SHARE_DIR share)
-else ()
+else (OPTION_NOINSTALL)
 	set (project_SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME})
 	set (project_INSTALL_SHARE_DIR share/${PROJECT_NAME})
-endif ()
+endif (OPTION_NOINSTALL)
 
 # Gather package information
 set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
@@ -65,12 +68,14 @@ set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Activity tracker")
 set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
 set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")
 set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
+set (CPACK_PACKAGE_VERSION ${project_VERSION})
 set (CPACK_GENERATOR "TGZ;ZIP")
 set (CPACK_PACKAGE_FILE_NAME
-	"${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+	"${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
-set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}-${PROJECT_VERSION}")
+set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
 set (CPACK_SOURCE_GENERATOR "TGZ;ZIP")
 set (CPACK_SOURCE_IGNORE_FILES "/build;/\\\\.git")
-set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
 
 include (CPack)
+

config.h.in

@@ -1,3 +1,3 @@
-#define PROJECT_NAME "@PROJECT_NAME@"
+#define PROJECT_NAME "@CMAKE_PROJECT_NAME@"
-#define PROJECT_VERSION "@PROJECT_VERSION@"
+#define PROJECT_VERSION "@project_VERSION@"
 #define SHARE_DIR "@project_SHARE_DIR@"

meson.build

@@ -4,8 +4,8 @@ add_project_arguments(['--vapidir', meson.current_source_dir()],
 	language: 'vala')
 
 conf = configuration_data()
-conf.set('PROJECT_NAME', meson.project_name())
+conf.set('CMAKE_PROJECT_NAME', meson.project_name())
-conf.set('PROJECT_VERSION', meson.project_version())
+conf.set('project_VERSION', meson.project_version())
 configure_file(
 	input : 'config.h.in',
 	output : 'config.h',

wdmtg.c

@@ -15,6 +15,10 @@
 // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <sqlite3.h>
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -24,10 +28,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <sqlite3.h>
-
 #include <xcb/xcb.h>
 #include <xcb/sync.h>
 
@@ -744,9 +744,7 @@ main(int argc, char *argv[])
 		g_build_filename(g_get_user_data_dir(), PROJECT_NAME, NULL);
 	g_mkdir_with_parents(data_path, 0755);
 
-	// Bind to a control socket, also ensuring only one instance is running.
+	// Bind to a control socket, also ensuring only one instance is running
-	// We're intentionally not using XDG_RUNTIME_DIR so that what is effectively
-	// the database lock is right next to the database.
 	gchar *socket_path = g_build_filename(data_path, "socket", NULL);
 	int socket_fd = socket_init(socket_path);
 	g_free(socket_path);