diff options
author | Dimitri Staessens <dimitri.staessens@ugent.be> | 2018-01-10 16:06:18 +0100 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@ugent.be> | 2018-01-10 18:38:30 +0100 |
commit | d22606dc078bbd618d2563a552a62cd4f46ac682 (patch) | |
tree | f3535e2de293c7f5f8f21ae44d2a0537ee941157 | |
parent | b71c2cc9938eee649d6b4a787d4c4bebe849d6e9 (diff) | |
download | ouroboros-d22606dc078bbd618d2563a552a62cd4f46ac682.tar.gz ouroboros-d22606dc078bbd618d2563a552a62cd4f46ac682.zip |
include: Add version header0.9.0
This moves the version definition for Ouroboros into its own header
file, which is generated by CMake and installed on the system.
Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>
Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
-rw-r--r-- | include/ouroboros/CMakeLists.txt | 7 | ||||
-rw-r--r-- | include/ouroboros/version.h.in | 30 | ||||
-rw-r--r-- | include/ouroboros/wrap/ouroboros.i | 2 | ||||
-rw-r--r-- | src/irmd/config.h.in | 4 | ||||
-rw-r--r-- | src/irmd/main.c | 1 |
5 files changed, 39 insertions, 5 deletions
diff --git a/include/ouroboros/CMakeLists.txt b/include/ouroboros/CMakeLists.txt index e94d5c6c..d3b6e847 100644 --- a/include/ouroboros/CMakeLists.txt +++ b/include/ouroboros/CMakeLists.txt @@ -1,3 +1,6 @@ +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.h.in" + "${CMAKE_CURRENT_BINARY_DIR}/version.h" @ONLY) + set(HEADER_FILES cacep.h cdefs.h @@ -8,7 +11,9 @@ set(HEADER_FILES ipcp.h irm.h proto.h - qos.h) + qos.h + ${CMAKE_CURRENT_BINARY_DIR}/version.h + ) install(FILES ${HEADER_FILES} DESTINATION usr/include/ouroboros) diff --git a/include/ouroboros/version.h.in b/include/ouroboros/version.h.in new file mode 100644 index 00000000..28c4bd92 --- /dev/null +++ b/include/ouroboros/version.h.in @@ -0,0 +1,30 @@ +/* + * Ouroboros - Copyright (C) 2016 - 2017 + * + * Ouroboros version + * + * Dimitri Staessens <dimitri.staessens@ugent.be> + * Sander Vrijders <sander.vrijders@ugent.be> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., http://www.fsf.org/about/contact/. + */ + +#ifndef OUROBOROS_VERSION_H +#define OUROBOROS_VERSION_H + +#define OUROBOROS_VERSION_MAJOR @PACKAGE_VERSION_MAJOR@ +#define OUROBOROS_VERSION_MINOR @PACKAGE_VERSION_MINOR@ +#define OUROBOROS_VERSION_PATCH @PACKAGE_VERSION_PATCH@ + +#endif /* OUROBOROS_VERSION_H */ diff --git a/include/ouroboros/wrap/ouroboros.i b/include/ouroboros/wrap/ouroboros.i index 25aa846e..a34c45ec 100644 --- a/include/ouroboros/wrap/ouroboros.i +++ b/include/ouroboros/wrap/ouroboros.i @@ -31,6 +31,7 @@ #include "ouroboros/irm.h" #include "ouroboros/ipcp.h" #include "ouroboros/qos.h" +#include "ouroboros/version.h" %} typedef int pid_t; @@ -44,3 +45,4 @@ typedef int pid_t; %include "ouroboros/irm.h" %include "ouroboros/ipcp.h" %include "ouroboros/qos.h" +%include "ouroboros/version.h" diff --git a/src/irmd/config.h.in b/src/irmd/config.h.in index 2a1a6d6a..923a6ef5 100644 --- a/src/irmd/config.h.in +++ b/src/irmd/config.h.in @@ -28,10 +28,6 @@ #define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" -#define OUROBOROS_VERSION_MAJOR @PACKAGE_VERSION_MAJOR@ -#define OUROBOROS_VERSION_MINOR @PACKAGE_VERSION_MINOR@ -#define OUROBOROS_VERSION_PATCH @PACKAGE_VERSION_PATCH@ - #define PTHREAD_COND_CLOCK @PTHREAD_COND_CLOCK@ #define SOCKET_TIMEOUT @SOCKET_TIMEOUT@ diff --git a/src/irmd/main.c b/src/irmd/main.c index f109d5e2..1e794139 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -42,6 +42,7 @@ #include <ouroboros/time_utils.h> #include <ouroboros/tpm.h> #include <ouroboros/logs.h> +#include <ouroboros/version.h> #include "utils.h" #include "registry.h" |