commit 1f7fcd0d1fa2a5b2fbcd4333bf14edf3ebb7324e
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Aug 12 00:33:16 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Sep 06 12:53:24 2016 -0700
tree 409c408956a0173037a6bd847a919d3db2e27f7d
parent 2e52d7cab4e03631db7f6c89a2daf7de590dd29e

[ndnSIM] build: A few custom hacks to cryptopp detection script

Change-Id: Id2c0f08bb350044a9c8ef15ec24087e5791e3140

.waf-tools/cryptopp.py

diff --git a/.waf-tools/cryptopp.py b/.waf-tools/cryptopp.py
index 8244d53..7f6c9b0 100644
--- a/.waf-tools/cryptopp.py
+++ b/.waf-tools/cryptopp.py
@@ -27,7 +27,7 @@
 CRYPTOPP_VERSION_FILE = 'config.h'
 
 CRYPTOPP_CHECK_FRAGMENT = '''
-#include "../../src/security/cryptopp.hpp"
+#include "../../src/ndnSIM/ndn-cxx/src/security/cryptopp.hpp"
 #include <iostream>
 
 int
@@ -101,7 +101,7 @@
         self.fatal('CryptoPP not found or is not usable')
 
     isLibWorking = False
-    for defines in ['', 'CRYPTOPP_DISABLE_ASM']:
+    for defines in [[], ['CRYPTOPP_DISABLE_ASM']]:
         try:
             self.check_cxx(msg='Checking if CryptoPP library works',
                            fragment=CRYPTOPP_CHECK_FRAGMENT,