aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2020-09-18 15:25:53 +0000
committerMauro Sardara <msardara@cisco.com>2020-09-18 15:25:53 +0000
commit5049dc9e3a5acecf9e1051973a043db95b653085 (patch)
treecccd51bac7966cd3138c525e8075d90341184a66
parent5cf2d8077c19387a2d257f0f7804209c7dd7cbb7 (diff)
Revert "[HICN-574] Fix compilation issue."
This reverts commit 5cf2d8077c19387a2d257f0f7804209c7dd7cbb7. Reason for revert: Merged in wrong branch Change-Id: Idd43a9ac9491ed89d93f2f786dfc8f5120d79ea9 Signed-off-by: Mauro Sardara <msardara@cisco.com>
-rw-r--r--CMakeLists.txt8
-rw-r--r--libtransport/CMakeLists.txt2
2 files changed, 1 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1963c471..27d3b419e 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,12 +99,6 @@ 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 f38c98560..28124b26e 100644
--- a/libtransport/CMakeLists.txt
+++ b/libtransport/CMakeLists.txt
@@ -128,8 +128,6 @@ list(APPEND LIBTRANSPORT_INTERNAL_INCLUDE_DIRS
${SAFE_VAPI_INCLUDE_DIRS}
)
-message("Libsafe vapi: ${SAFE_VAPI_INCLUDE_DIRS}")
-
include(Packaging)
find_package(Threads REQUIRED)