From 9ea7ddec0c8b83cb38ce41477116f31614d6623e Mon Sep 17 00:00:00 2001
From: Justin Brewer <jzb0012@auburn.edu>
Date: Mon, 21 Jan 2019 13:42:58 -0600
Subject: Generate and install hiredis.pc

Signed-off-by: Justin Brewer <jzb0012@auburn.edu>
---
 hiredis.pc.in | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 hiredis.pc.in

(limited to 'hiredis.pc.in')

diff --git a/hiredis.pc.in b/hiredis.pc.in
new file mode 100644
index 0000000..22ec937
--- /dev/null
+++ b/hiredis.pc.in
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+pkgincludedir=${includedir}/hiredis
+
+Name: hiredis
+Description: Minimalistic C client library for Redis.
+Version: @VERSION@
+Libs: -L${libdir} -lhiredis
+Cflags: -I${pkgincludedir} -D_FILE_OFFSET_BITS=64
-- 
cgit v1.2.3


From 7d38176bdbe55621dfb547d3d481c700dcdba721 Mon Sep 17 00:00:00 2001
From: Justin Brewer <jzb0012@auburn.edu>
Date: Mon, 21 Jan 2019 13:57:11 -0600
Subject: Call project() with parsed version string

Signed-off-by: Justin Brewer <jzb0012@auburn.edu>
---
 CMakeLists.txt | 19 ++++++++-----------
 hiredis.pc.in  |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'hiredis.pc.in')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51020ee..f40bbc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,26 +1,23 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
 INCLUDE(GNUInstallDirs)
-PROJECT(redisearch)
 
-SET(ENABLE_EXAMPLES OFF CACHE BOOL "Enable building hiredis examples")
-
-# Get the version numbers
 MACRO(getVersionBit name)
-
-EXECUTE_PROCESS(
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-    COMMAND grep "${name}" hiredis.h COMMAND awk "{print $3}"
-    OUTPUT_VARIABLE "${name}"
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  SET(VERSION_REGEX "^#define ${name} (.+)$")
+  FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/hiredis.h"
+    VERSION_BIT REGEX ${VERSION_REGEX})
+  STRING(REGEX REPLACE ${VERSION_REGEX} "\\1" ${name} "${VERSION_BIT}")
 ENDMACRO(getVersionBit)
 
 getVersionBit(HIREDIS_MAJOR)
 getVersionBit(HIREDIS_MINOR)
 getVersionBit(HIREDIS_PATCH)
-
 SET(VERSION "${HIREDIS_MAJOR}.${HIREDIS_MINOR}.${HIREDIS_PATCH}")
 MESSAGE("Detected version: ${VERSION}")
 
+PROJECT(hiredis VERSION "${VERSION}")
+
+SET(ENABLE_EXAMPLES OFF CACHE BOOL "Enable building hiredis examples")
+
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR})
 
 ADD_LIBRARY(hiredis SHARED
diff --git a/hiredis.pc.in b/hiredis.pc.in
index 22ec937..140b040 100644
--- a/hiredis.pc.in
+++ b/hiredis.pc.in
@@ -6,6 +6,6 @@ pkgincludedir=${includedir}/hiredis
 
 Name: hiredis
 Description: Minimalistic C client library for Redis.
-Version: @VERSION@
+Version: @PROJECT_VERSION@
 Libs: -L${libdir} -lhiredis
 Cflags: -I${pkgincludedir} -D_FILE_OFFSET_BITS=64
-- 
cgit v1.2.3