diff options
| author |   Mauro Sardara <msardara+fdio@cisco.com> | 2017-06-05 17:51:06 +0200 |
|---|---|---|
| committer | Mauro Sardara <msardara+fdio@cisco.com> | 2017-06-05 17:51:06 +0200 |
| commit | 4b109777e012d90e47660b07488201286cefc0c4 (patch) | |
| tree | 77a14a253320a2a09ef32560d2adee536291781f /metis/ccnx/forwarder | |
| parent | 77323a5c646ad0c6919d0848d63b9791a745c90b (diff) | |
- Added support for differetn build types (DEBUG, RELEASE, RELEASE with debug symbols, RELEASE with min size executable)
- Added support for iOS
Change-Id: Id9e5ccc4ba7b6c1b9aedae63bce3c47ea5cfd68b
Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>
Diffstat (limited to 'metis/ccnx/forwarder')
3 files changed, 14 insertions, 11 deletions
diff --git a/metis/ccnx/forwarder/metis/CMakeLists.txt b/metis/ccnx/forwarder/metis/CMakeLists.txt index ab8c8e27..24f278a0 100644 --- a/metis/ccnx/forwarder/metis/CMakeLists.txt +++ b/metis/ccnx/forwarder/metis/CMakeLists.txt @@ -333,9 +333,7 @@ foreach(lib ${metis_libraries}) set_property(TARGET ${lib} PROPERTY C_STANDARD 99) endforeach() -if(NOT ANDROID_API) - add_subdirectory(command-line) -else () +if (COMPILE_FOR_IOS OR ANDROID_API) install(FILES ${METIS_BASE_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ccnx/forwarder/metis) install(FILES ${METIS_CONFIG_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ccnx/forwarder/metis/config) install(FILES ${METIS_CONTENT_STORE_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ccnx/forwarder/metis/content_store) @@ -345,8 +343,9 @@ else () install(FILES ${METIS_PROCESSOR_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ccnx/forwarder/metis/processor) install(FILES ${METIS_STRATEGIES_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ccnx/forwarder/metis/strategies) install(FILES ${METIS_TLV_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ccnx/forwarder/metis/tlv) - install(FILES ${CMAKE_INSTALL_PREFIX}/../build/sb-forwarder/metis/ccnx/forwarder/metis/config.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include) - + install(FILES ${CMAKE_BINARY_DIR}/ccnx/forwarder/metis/config.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include) +else() + add_subdirectory(command-line) endif() add_subdirectory(test) diff --git a/metis/ccnx/forwarder/metis/command-line/metis_control/CMakeLists.txt b/metis/ccnx/forwarder/metis/command-line/metis_control/CMakeLists.txt index e07d5f40..38e0cc94 100644 --- a/metis/ccnx/forwarder/metis/command-line/metis_control/CMakeLists.txt +++ b/metis/ccnx/forwarder/metis/command-line/metis_control/CMakeLists.txt @@ -1,4 +1,6 @@ -add_executable(metis_control metisControl_main.c) -target_link_libraries(metis_control ${METIS_LINK_LIBRARIES}) +if(NOT COMPILE_FOR_IOS) + add_executable(metis_control metisControl_main.c) + target_link_libraries(metis_control ${METIS_LINK_LIBRARIES}) -install(TARGETS metis_control RUNTIME DESTINATION bin) + install(TARGETS metis_control RUNTIME DESTINATION bin) +endif()
\ No newline at end of file diff --git a/metis/ccnx/forwarder/metis/command-line/metis_daemon/CMakeLists.txt b/metis/ccnx/forwarder/metis/command-line/metis_daemon/CMakeLists.txt index 957cab17..673d5063 100644 --- a/metis/ccnx/forwarder/metis/command-line/metis_daemon/CMakeLists.txt +++ b/metis/ccnx/forwarder/metis/command-line/metis_daemon/CMakeLists.txt @@ -1,4 +1,6 @@ -add_executable(metis_daemon metis_daemon.c) -target_link_libraries(metis_daemon ${METIS_LINK_LIBRARIES}) +if(NOT COMPILE_FOR_IOS) + add_executable(metis_daemon metis_daemon.c) + target_link_libraries(metis_daemon ${METIS_LINK_LIBRARIES}) -install(TARGETS metis_daemon RUNTIME DESTINATION bin) + install(TARGETS metis_daemon RUNTIME DESTINATION bin) +endif() |