diff options
| author |   Jordan Augé <jordan.auge+fdio@cisco.com> | 2019-07-26 23:20:30 +0200 |
|---|---|---|
| committer |   Mauro Sardara <msardara@cisco.com> | 2019-07-29 17:13:35 +0200 |
| commit | 0a1c6b5565e20167d1f1f33a5a8b597f420b18b0 (patch) | |
| tree | 98c5da8f231fbd3dc2ce6502040e29c8333d9ffc /libtransport | |
| parent | 05ca0aa8f612ee48fb66d4dbebe596b7f1e03181 (diff) | |
[HICN-252] Add per-application policy framework to hicn-light forwarder
Change-Id: I0531cd7a7de179581295ae34766c81cd9cf3e172
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Co-authored-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'libtransport')
| -rw-r--r-- | libtransport/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | libtransport/src/hicn/transport/CMakeLists.txt | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index 4ae46bb9a..fb059e390 100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -59,7 +59,7 @@ if ((BUILD_HICNPLUGIN OR BUILD_MEMIF_CONNECTOR) AND "${CMAKE_SYSTEM_NAME}" STREQ set(__vpp__ 1) find_package(Vpp REQUIRED) find_package(Libmemif REQUIRED) - list(APPEND LIBTRANSPORT_INCLUDE_DIRS + list(APPEND LIBTRANSPORT_INTERNAL_INCLUDE_DIRS ${VPP_INCLUDE_DIRS} ${LIBMEMIF_INCLUDE_DIRS} ) @@ -110,7 +110,7 @@ find_package(Threads REQUIRED) if (${COMPILE_TESTS}) include(TestMacros) find_package(GTest REQUIRED) - list(APPEND LIBTRANSPORT_INCLUDE_DIRS + list(APPEND LIBTRANSPORT_INTERNAL_INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ) endif() @@ -130,7 +130,7 @@ list(APPEND LIBRARIES ) # Include dirs -- Order does matter! -list(APPEND LIBTRANSPORT_INCLUDE_DIRS +list(APPEND LIBTRANSPORT_INTERNAL_INCLUDE_DIRS ${HICN_INCLUDE_DIRS} ${HICN_BINARY_API_INCLUDE_DIRS} ${LIBPARC_INCLUDE_DIRS} diff --git a/libtransport/src/hicn/transport/CMakeLists.txt b/libtransport/src/hicn/transport/CMakeLists.txt index 3b5e9a15f..76fcd072b 100644 --- a/libtransport/src/hicn/transport/CMakeLists.txt +++ b/libtransport/src/hicn/transport/CMakeLists.txt @@ -34,11 +34,18 @@ install( set (COMPILER_DEFINITIONS "-DTRANSPORT_LOG_DEF_LEVEL=TRANSPORT_LOG_${TRANSPORT_LOG_LEVEL}") -list(INSERT LIBTRANSPORT_INCLUDE_DIRS 0 +list(INSERT LIBTRANSPORT_INTERNAL_INCLUDE_DIRS 0 ${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_CURRENT_BINARY_DIR}/../.. ) +set(LIBTRANSPORT_INCLUDE_DIRS + ${CMAKE_CURRENT_SOURCE_DIR}/../../ + ${CMAKE_CURRENT_BINARY_DIR}/../../ + "" CACHE INTERNAL + "" FORCE +) + if (NOT WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") else () @@ -58,7 +65,7 @@ if (ANDROID_API) LINK_LIBRARIES ${LIBRARIES} DEPENDS ${DEPENDENCIES} COMPONENT lib${LIBTRANSPORT} - INCLUDE_DIRS ${LIBTRANSPORT_INCLUDE_DIRS} + INCLUDE_DIRS ${LIBTRANSPORT_INTERNAL_INCLUDE_DIRS} INSTALL_ROOT_DIR hicn/transport DEFINITIONS ${COMPILER_DEFINITIONS} ) @@ -70,7 +77,7 @@ else () LINK_LIBRARIES ${LIBRARIES} DEPENDS ${DEPENDENCIES} COMPONENT lib${LIBTRANSPORT} - INCLUDE_DIRS ${LIBTRANSPORT_INCLUDE_DIRS} + INCLUDE_DIRS ${LIBTRANSPORT_INTERNAL_INCLUDE_DIRS} INSTALL_ROOT_DIR hicn/transport DEFINITIONS ${COMPILER_DEFINITIONS} ) |