From b9fbd392692a43369f87c9e4b3c90c0c00c3f5c1 Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara@cisco.com>
Date: Fri, 18 Sep 2020 17:57:21 +0200
Subject: [HICN-574] Fix compilation issue.

This reverts commit 5049dc9e3a5acecf9e1051973a043db95b653085.

Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I63cb00990d2ad22e5ad895eb950d163661cfa8fd
---
 CMakeLists.txt              | 8 +++++++-
 libtransport/CMakeLists.txt | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27d3b419e..a1963c471 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,9 +63,9 @@ endif()
 list(APPEND dir_options
   BUILD_LIBHICN
   BUILD_HICNLIGHT
+  BUILD_LIBTRANSPORT
   BUILD_HICNPLUGIN
   BUILD_CTRL
-  BUILD_LIBTRANSPORT
   BUILD_UTILS
   BUILD_APPS
   BUILD_SYSREPOPLUGIN
@@ -99,6 +99,12 @@ endif ()
 
 message(STATUS "Building the following subprojects: ${subdirs}")
 
+set(SAFE_VAPI_INCLUDE_DIRS
+  ${CMAKE_CURRENT_SOURCE_DIR}/${BUILD_HICNPLUGIN_DIR}/vapi/include ""
+  CACHE INTERNAL
+  "" FORCE
+)
+
 foreach(dir ${subdirs})
   add_subdirectory(${dir})
 endforeach()
diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt
index 28124b26e..f38c98560 100644
--- a/libtransport/CMakeLists.txt
+++ b/libtransport/CMakeLists.txt
@@ -128,6 +128,8 @@ list(APPEND LIBTRANSPORT_INTERNAL_INCLUDE_DIRS
   ${SAFE_VAPI_INCLUDE_DIRS}
 )
 
+message("Libsafe vapi: ${SAFE_VAPI_INCLUDE_DIRS}")
+
 include(Packaging)
 
 find_package(Threads REQUIRED)
-- 
cgit 1.2.3-korg