From: Angelo Mantellini <angelo.mantellini@irt-systemx.fr>
Date: Thu, 16 Nov 2017 11:51:37 +0000 (+0100)
Subject: correct conflict boost when android sdk is running
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F9447%2F1;p=cicn.git

correct conflict boost when android sdk is running

Change-Id: I8a45d86b114c62eeecb9b4875e9972ac4fb8a694
Signed-off-by: Angelo Mantellini <angelo.mantellini@irt-systemx.fr>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d7b834a..b61cbe05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,7 @@ else ()
 
   find_package(Threads REQUIRED)
   include_directories(${CMAKE_THREADS_INCLUDE_DIRS})
-
+  set(BOOST_ROOT $ENV{CCNX_DEPENDENCIES})
   find_package(Boost 1.53.0 COMPONENTS system REQUIRED)
   include_directories(SYSTEM ${Boost_INCLUDE_DIR})
 endif()