From 6b84ec54083da9911f5ad4816d0eb4f4745afad4 Mon Sep 17 00:00:00 2001
From: Jordan Augé <jordan.auge+fdio@cisco.com>
Date: Mon, 7 Oct 2019 09:52:33 +0200
Subject: [HICN-298] Release new hICN app for Android
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I43adc62fadf00690b687078d739788dffdc5e566
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>
---
 ctrl/facemgr/CMakeLists.txt | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

(limited to 'ctrl/facemgr/CMakeLists.txt')

diff --git a/ctrl/facemgr/CMakeLists.txt b/ctrl/facemgr/CMakeLists.txt
index f688dd2ca..377773c2d 100644
--- a/ctrl/facemgr/CMakeLists.txt
+++ b/ctrl/facemgr/CMakeLists.txt
@@ -20,6 +20,22 @@ endif()
 
 project(facemgr)
 
+option(WITH_THREAD "Run library as thread" OFF)
+option(WITH_EXAMPLE_DUMMY "Compile dummy example interface" OFF)
+option(WITH_EXAMPLE_UPDOWN "Compile updown example interface" OFF)
+
+if(WITH_THREAD)
+    message("Building with thread support")
+endif()
+
+if(WITH_EXAMPLE_DUMMY)
+    message("Building with 'dummy' example interface")
+endif()
+
+if(WITH_EXAMPLE_UPDOWN)
+    message("Building with 'updown' example interface")
+endif()
+
 if (NOT CMAKE_BUILD_TYPE)
     message(STATUS "${PROJECT_NAME}: No build type selected, default to Release")
     set(CMAKE_BUILD_TYPE "Release")
@@ -42,22 +58,29 @@ find_package_wrapper(Config REQUIRED)
 find_package_wrapper(LibEvent REQUIRED)
 
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+  find_package_wrapper(Libhicn REQUIRED)
   find_package_wrapper(Libhicnctrl REQUIRED)
-  set(FACE_MGR facemgr)
+  set(FACEMGR facemgr)
+  set(LIBFACEMGR facemgr)
 else()
-  if (ANDROID_API)
-    set(LIBHICNCTRL_LIBRARIES ${LIBHICN_CTRL_STATIC})
+  if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
+    set(HICN_LIBRARIES ${LIBHICN_STATIC})
+    set(LIBHICNCTRL_LIBRARIES ${LIBHICNCTRL_STATIC})
     list(APPEND DEPENDENCIES
-      ${LIBHICN_CTRL_STATIC}
+      ${LIBHICN_STATIC}
+      ${LIBHICNCTRL_STATIC}
     )
   else ()
-    set(LIBHICNCTRL_LIBRARIES ${LIBHICN_CTRL_SHARED})
+    set(HICN_LIBRARIES ${LIBHICN_SHARED})
+    set(LIBHICNCTRL_LIBRARIES ${LIBHICNCTRL_SHARED})
     list(APPEND DEPENDENCIES
-      ${LIBHICN_CTRL_SHARED}
+      ${LIBHICN_SHARED}
+      ${LIBHICNCTRL_SHARED}
     )
   endif ()
 endif()
 
+add_subdirectory(includes)
 add_subdirectory(src)
 
 include(Packaging)
-- 
cgit 1.2.3-korg