From 3f91e24a4d57a061e0fae65823f3a5504bcd4ddc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Moreau?= Date: Sat, 14 Jan 2012 13:33:04 -0500 Subject: [PATCH] libfreerdp-core: added freerdp_get_version() --- CMakeLists.txt | 6 +++--- config.h.in | 4 ++++ include/freerdp/freerdp.h | 2 ++ libfreerdp-core/freerdp.c | 12 ++++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cb6414c..a051c14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,12 +36,12 @@ include(FindOptionalPackage) include(CheckCCompilerFlag) include(GNUInstallDirsWrapper) -# Soname versioning - 0.0.0 since it is not being managed yet +# Soname versioning set(FREERDP_VERSION_MAJOR "1") set(FREERDP_VERSION_MINOR "0") -set(FREERDP_VERSION_PATCH "0") +set(FREERDP_VERSION_REVISION "0") set(FREERDP_VERSION "${FREERDP_VERSION_MAJOR}.${FREERDP_VERSION_MINOR}") -set(FREERDP_VERSION_FULL "${FREERDP_VERSION}.${FREERDP_VERSION_PATCH}") +set(FREERDP_VERSION_FULL "${FREERDP_VERSION}.${FREERDP_VERSION_REVISION}") # Default to release build type if(NOT CMAKE_BUILD_TYPE) diff --git a/config.h.in b/config.h.in index 979fa97..c43ca0c 100644 --- a/config.h.in +++ b/config.h.in @@ -1,7 +1,11 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define FREERDP_VERSION "${FREERDP_VERSION}" #define FREERDP_VERSION_FULL "${FREERDP_VERSION_FULL}" +#define FREERDP_VERSION_MAJOR ${FREERDP_VERSION_MAJOR} +#define FREERDP_VERSION_MINOR ${FREERDP_VERSION_MINOR} +#define FREERDP_VERSION_REVISION ${FREERDP_VERSION_REVISION} /* Include files */ #cmakedefine HAVE_SYS_PARAM_H diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h index 54b9e7b..2613d57 100644 --- a/include/freerdp/freerdp.h +++ b/include/freerdp/freerdp.h @@ -111,6 +111,8 @@ FREERDP_API boolean freerdp_check_fds(freerdp* instance); FREERDP_API void freerdp_send_keep_alive(freerdp* instance); FREERDP_API uint32 freerdp_error_info(freerdp* instance); +FREERDP_API void freerdp_get_version(int* major, int* minor, int* revision); + FREERDP_API freerdp* freerdp_new(); FREERDP_API void freerdp_free(freerdp* instance); diff --git a/libfreerdp-core/freerdp.c b/libfreerdp-core/freerdp.c index 490d081..a78f83a 100644 --- a/libfreerdp-core/freerdp.c +++ b/libfreerdp-core/freerdp.c @@ -147,6 +147,18 @@ boolean freerdp_disconnect(freerdp* instance) return true; } +void freerdp_get_version(int* major, int* minor, int* revision) +{ + if (major != NULL) + *major = FREERDP_VERSION_MAJOR; + + if (minor != NULL) + *minor = FREERDP_VERSION_MINOR; + + if (revision != NULL) + *revision = FREERDP_VERSION_REVISION; +} + void freerdp_context_new(freerdp* instance) { rdpRdp* rdp; -- 2.7.4