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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/src/CMakeLists.txt | 18 |
2 files changed, 14 insertions, 8 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 51aeccb2a..4c51f3daf 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -27,8 +27,8 @@ if (NOT CMAKE_BUILD_TYPE) endif() if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) - set(LIBHICN hicn) - set(LIBHICN_STATIC ${LIBHICN}.static) + set(LIBHICN hicn) + set(LIBHICN_STATIC ${LIBHICN}.static) endif() include (Packaging) diff --git a/lib/src/CMakeLists.txt b/lib/src/CMakeLists.txt index d62ac7e8f..65eae8d77 100644 --- a/lib/src/CMakeLists.txt +++ b/lib/src/CMakeLists.txt @@ -50,7 +50,7 @@ list(APPEND LIBHICN_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/protocol/tcp.c ) -set (COMPILER_DEFINITIONS "-DWITH_MAPME -DWITH_MAPME_FIXES") +set (COMPILER_DEFINITIONS "-DWITH_MAPME") include(BuildMacros) include(WindowsMacros) @@ -79,17 +79,23 @@ else () ) endif () add_custom_command(TARGET ${LIBHICN_STATIC} PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_BINARY_DIR}/hicn + COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/hicn ) add_custom_command(TARGET ${LIBHICN_STATIC} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/hicn/ - COMMAND ${CMAKE_COMMAND} -E copy ${LIBHICN_HEADER_FILES} ${PROJECT_BINARY_DIR}/hicn/ + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/hicn/ + COMMAND ${CMAKE_COMMAND} -E copy ${LIBHICN_HEADER_FILES} ${CMAKE_BINARY_DIR}/hicn/ ) add_custom_command(TARGET ${LIBHICN_STATIC} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/hicn/protocol - COMMAND ${CMAKE_COMMAND} -E copy ${LIBHICN_HEADER_FILES_PROTOCOL} ${PROJECT_BINARY_DIR}/hicn/protocol + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/hicn/protocol + COMMAND ${CMAKE_COMMAND} -E copy ${LIBHICN_HEADER_FILES_PROTOCOL} ${CMAKE_BINARY_DIR}/hicn/protocol +) + +set(HICN_INCLUDE_DIRS + ${CMAKE_BINARY_DIR} "" + CACHE INTERNAL + "" FORCE ) # install(FILES ${LIBHICN_HEADER_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/hicn COMPONENT libhicn) |