From a33df85308c9d1f574e1d2218648996d9210ef7b Mon Sep 17 00:00:00 2001 From: Paul Fariello Date: Mon, 11 Mar 2019 11:58:08 +0100 Subject: [PATCH 1/2] Expose libsignal version in headers --- src/CMakeLists.txt | 5 +++++ src/version.h.in | 1 + 2 files changed, 6 insertions(+) create mode 100644 src/version.h.in diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a4ede650..5854dbef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,6 +17,9 @@ set(protobuf_SRCS FingerprintProtocol.pb-c.c ) +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY) + set(signal_protocol_SRCS vpool.c vpool.h @@ -59,6 +62,7 @@ set(signal_protocol_SRCS fingerprint.h device_consistency.c device_consistency.h + version.h ) add_subdirectory(curve25519) @@ -100,6 +104,7 @@ INSTALL( group_cipher.h fingerprint.h device_consistency.h + ${CMAKE_CURRENT_BINARY_DIR}/version.h DESTINATION ${INCLUDE_INSTALL_DIR}/signal ) diff --git a/src/version.h.in b/src/version.h.in new file mode 100644 index 00000000..9797a79c --- /dev/null +++ b/src/version.h.in @@ -0,0 +1 @@ +#cmakedefine SIGNAL_PROTOCOL_C_VERSION "@SIGNAL_PROTOCOL_C_VERSION@" From cc441f3fdef7d7d2446b698700690b82a7fb6848 Mon Sep 17 00:00:00 2001 From: Paul Fariello Date: Mon, 11 Mar 2019 22:20:21 +0100 Subject: [PATCH 2/2] Add include guards an for version header --- src/version.h.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/version.h.in b/src/version.h.in index 9797a79c..e46c9ae6 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -1 +1,6 @@ +#ifndef SIGNAL_VERSION_H +#define SIGNAL_VERSION_H + #cmakedefine SIGNAL_PROTOCOL_C_VERSION "@SIGNAL_PROTOCOL_C_VERSION@" + +#endif /* SIGNAL_VERSION_H */