commit 3b5f4eae1912ecb8253e6e079de724c043bae35c
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Dec 23 22:47:20 2015 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Dec 23 22:48:17 2015 -0800
tree ae2b9aea0e39c83afe6d764a3ddd19a2f0f87e99
parent 48c291be0747f7d6e5ca31b6fd44e671c26bbcea

build: Improve cryptopp version detection

Change-Id: Ice7f69d0668e1943d2f27b5f15c0384854456d1a

.waf-tools/cryptopp.py

diff --git a/.waf-tools/cryptopp.py b/.waf-tools/cryptopp.py
index a005123..8244d53 100644
--- a/.waf-tools/cryptopp.py
+++ b/.waf-tools/cryptopp.py
@@ -87,12 +87,14 @@
 
     try:
         txt = file.read()
-        re_version = re.compile('^#define\\s+CRYPTOPP_VERSION\\s+(.*)', re.M)
+        re_version = re.compile('^#define\\s+CRYPTOPP_VERSION\\s+([0-9]+)', re.M)
         match = re_version.search(txt)
 
         if match:
             self.env.CRYPTOPP_VERSION = match.group(1)
-            self.end_msg(self.env.CRYPTOPP_VERSION)
+            v = int(self.env.CRYPTOPP_VERSION)
+            (major, minor, patch) = (int(v / 100), int(v % 100 / 10), int(v % 10))
+            self.end_msg("%d.%d.%d" % (major, minor, patch))
         else:
             self.fatal('CryptoPP files are present, but are not recognizable')
     except: