Code Review
/
cicn.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
79e435d
)
correct conflict boost when android sdk is running
47/9447/1
author
Angelo Mantellini
<
[email protected]
>
Thu, 16 Nov 2017 11:51:37 +0000
(12:51 +0100)
committer
Angelo Mantellini
<
[email protected]
>
Thu, 16 Nov 2017 11:51:37 +0000
(12:51 +0100)
Change-Id: I8a45d86b114c62eeecb9b4875e9972ac4fb8a694
Signed-off-by: Angelo Mantellini <
[email protected]
>
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
6d7b834
..
b61cbe0
100644
(file)
--- 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()