Build

CMakeLists.txt

@@ -1,33 +1,51 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.0)
 
-project (MQTTAGENT C)
+project(mqtt-tools
+    VERSION 0.1.0
+    LANGUAGES C)
 
-file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+#
+# NOTE  This project uses semantic versioning as described at
+#
+#       https://semver.org/
+#
+#       As long as all components (libraries, agents, helper) are in the
+#       same Git repository, all have to share the same version numbers,
+#       because those can not be distinguished with different tags.
+#
 
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
 
-# These libraries are noted here for later use
+# Additional CMake modules
+include(GNUInstallDirs)				# cmake 2.8.5
+
+# Options
+option(BUILD_SHARED_LIBS
+    "Global flag to cause add_library to create shared libraries if on."
+    OFF
+)
+
+# Requirements (commented libraries noted here for later use)
 find_library(CONFIG_LIBRARY NAMES config)
 #find_library(PTHREAD_LIBRARY NAMES pthread)
 #find_library(POPT_LIBRARY NAMES popt)
 find_library(MOSQUITTO_LIBRARY NAMES mosquitto)
 
 # Headers
-configure_file(
-    mqtta-build.h.in
-    mqtta-build.h
-    @ONLY
-)
-include_directories(
-    "${CMAKE_CURRENT_BINARY_DIR}"
-)
+add_subdirectory(include/mqtt-tools)
+
+# Libraries
+add_subdirectory(lib)
+
+# Agents
+add_subdirectory(agents)
 
-add_executable(mqtt-clock
-mqtt-clock.c
-mosqagent.c
-mosqhelper.c
+# Install CMake targets
+install(EXPORT ${PROJECT_NAME}-targets
+	DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
 )
 
-target_link_libraries(mqtt-clock ${CONFIG_LIBRARY})
+# For later
 #target_link_libraries(mqtt-clock ${POPT_LIBRARY})
 #target_link_libraries(mqtt-clock ${PTHREAD_LIBRARY})
-target_link_libraries(mqtt-clock ${MOSQUITTO_LIBRARY})

agents/CMakeLists.txt

@@ -0,0 +1,16 @@
+include_directories(
+	"${PROJECT_SOURCE_DIR}/include"
+    "${PROJECT_BINARY_DIR}/include"
+)
+
+# mqtt-clock
+add_executable(mqtt-clock
+    mqtt-clock.c
+)
+target_link_libraries(mqtt-clock
+    mosqhelper
+    mqtta
+)
+install(TARGETS mqtt-clock
+	RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+)

mqtt-clock.c → agents/mqtt-clock.c

@@ -16,8 +16,8 @@
 #include <time.h>
 #include <sys/time.h>
 
-#include "mosqagent.h"
-#include "mosqhelper.h"
+#include <mqtt-tools/mqtta.h>
+#include <mqtt-tools/mosqhelper.h>
 
 #define WITH_SYSLOG
 #ifdef WITH_SYSLOG

include/mqtt-tools/CMakeLists.txt

@@ -0,0 +1,11 @@
+configure_file(
+    mqtta-build.h.in
+    mqtta-build.h
+    @ONLY
+)
+
+install(FILES
+	mqtta.h
+	mosqhelper.h
+	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mqtt-tools"
+)

lib/CMakeLists.txt

@@ -0,0 +1,42 @@
+include_directories(
+	"${PROJECT_SOURCE_DIR}/include/mqtt-tools"
+    "${PROJECT_BINARY_DIR}/include/mqtt-tools"
+)
+
+# mosqhelper
+add_library(mosqhelper
+    mosqhelper.c
+)
+set_target_properties(mosqhelper PROPERTIES
+    OUTPUT_NAME mosqhelper
+    SOVERSION   ${PROJECT_VERSION_MAJOR}
+    VERSION     ${PROJECT_VERSION}
+)
+target_link_libraries(mosqhelper
+    "${MOSQUITTO_LIBRARY}"
+)
+install(TARGETS mosqhelper
+	EXPORT ${PROJECT_NAME}-targets
+	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)
+
+# mqtta
+add_library(mqtta
+    mqtta.c
+)
+set_target_properties(mqtta PROPERTIES
+    OUTPUT_NAME mqtta
+    SOVERSION   ${PROJECT_VERSION_MAJOR}
+    VERSION     ${PROJECT_VERSION}
+)
+target_link_libraries(mqtta
+    mosqhelper
+    "${CONFIG_LIBRARY}"
+    "${MOSQUITTO_LIBRARY}"
+)
+install(TARGETS mqtta
+	EXPORT ${PROJECT_NAME}-targets
+	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)

mosqhelper.c → lib/mosqhelper.c

@@ -10,6 +10,8 @@
 #include <syslog.h>
 #include <unistd.h>
 
+#include <mosquitto.h>
+
 int mqtt_init(const char* clientname,
 	      struct mosquitto **mosq,
 	      void *mqtt_obj)

mosqagent.c → lib/mqtta.c

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "mosqagent.h"
+#include "mqtta.h"
 
 #include <errno.h>
 #include <stddef.h>