From 4b109777e012d90e47660b07488201286cefc0c4 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Mon, 5 Jun 2017 17:51:06 +0200 Subject: - 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 --- metis/ccnx/forwarder/metis/CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'metis/ccnx/forwarder/metis/CMakeLists.txt') 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) -- cgit 1.2.3-korg