compile: Change includes and wscript to compile against ndn-cpp-dev

src/sec-policy-sync.cc

@@ -10,8 +10,8 @@
 
 #include "sync-intro-certificate.h"
 #include "sync-logging.h"
-#include <ndn-cpp/security/verifier.hpp>
-#include <ndn-cpp/security/signature-sha256-with-rsa.hpp>
+#include <ndn-cpp-dev/security/verifier.hpp>
+#include <ndn-cpp-dev/security/signature-sha256-with-rsa.hpp>
 
 #include "sec-policy-sync.h"
 

src/sec-policy-sync.h

@@ -11,11 +11,11 @@
 #ifndef SEC_POLICY_SYNC_H
 #define SEC_POLICY_SYNC_H
 
-#include <ndn-cpp/face.hpp>
-#include <ndn-cpp/security/key-chain.hpp>
-#include <ndn-cpp/security/verifier.hpp>
-#include <ndn-cpp/security/sec-policy.hpp>
-#include <ndn-cpp/security/identity-certificate.hpp>
+#include <ndn-cpp-dev/face.hpp>
+#include <ndn-cpp-dev/security/key-chain.hpp>
+#include <ndn-cpp-dev/security/verifier.hpp>
+#include <ndn-cpp-dev/security/sec-policy.hpp>
+#include <ndn-cpp-dev/security/identity-certificate.hpp>
 #include <ndn-cpp-et/regex/regex.hpp>
 #include <ndn-cpp-et/policy/sec-rule-identity.hpp>
 #include <map>

src/sec-rule-sync-specific.cc

@@ -9,7 +9,7 @@
  */
 
 #include "sec-rule-sync-specific.h"
-#include <ndn-cpp/security/signature-sha256-with-rsa.hpp>
+#include <ndn-cpp-dev/security/signature-sha256-with-rsa.hpp>
 
 using namespace ndn;
 using namespace ndn::ptr_lib;

src/sync-intro-certificate.h

@@ -11,8 +11,8 @@
 #ifndef SYNC_INTRO_CERTIFICATE_H
 #define SYNC_INTRO_CERTIFICATE_H
 
-#include <ndn-cpp/security/certificate.hpp>
-#include <ndn-cpp/security/identity-certificate.hpp>
+#include <ndn-cpp-dev/security/certificate.hpp>
+#include <ndn-cpp-dev/security/identity-certificate.hpp>
 
 class SyncIntroCertificate : public ndn::Certificate
 {

src/sync-logic.h

@@ -29,9 +29,9 @@
 #include <memory>
 #include <map>
 
-#include <ndn-cpp/face.hpp>
-#include <ndn-cpp/security/verifier.hpp>
-#include <ndn-cpp/security/key-chain.hpp>
+#include <ndn-cpp-dev/face.hpp>
+#include <ndn-cpp-dev/security/verifier.hpp>
+#include <ndn-cpp-dev/security/key-chain.hpp>
 
 #include "sync-interest-table.h"
 #include "sync-diff-state.h"

src/sync-socket.h

@@ -25,9 +25,9 @@
 #include <boost/function.hpp>
 #include <boost/unordered_map.hpp>
 #include "sync-seq-no.h"
-#include <ndn-cpp/face.hpp>
-#include <ndn-cpp/security/verifier.hpp>
-#include <ndn-cpp/security/key-chain.hpp>
+#include <ndn-cpp-dev/face.hpp>
+#include <ndn-cpp-dev/security/verifier.hpp>
+#include <ndn-cpp-dev/security/key-chain.hpp>
 #include <utility>
 #include <map>
 #include <vector>

wscript

@@ -36,7 +36,7 @@ def configure(conf):
 
     # conf.check_ndnx ()
 
-    conf.check_ndncpp (path=conf.options.ndn_cpp_dir)
+    conf.check_cfg(package='libndn-cpp-dev', args=['--cflags', '--libs'], uselib_store='NDNCPP', mandatory=True)
     conf.check_cfg(package='libndn-cpp-et', args=['--cflags', '--libs'], uselib_store='NDN-CPP-ET', mandatory=True)
     
     conf.check_cfg(package='openssl', args=['--cflags', '--libs'], uselib_store='OPENSSL', mandatory=True)