From 4da1b7955fb3190c0e0646cfde99436aa140d271 Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara+fdio@cisco.com>
Date: Mon, 5 Jun 2017 18:43:52 +0200
Subject: - Added proxy function - Changed interface between library and
 application - Support for different build type

Change-Id: I34ae75057490eb887d353e53c6d013f88bead04f
Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>
---
 cmake/Modules/FindCURL.cmake      | 69 +++++++++++++++++++++++++++++++++++++++
 cmake/Modules/FindLibhicnet.cmake | 39 ++++++++++++++++++++++
 cmake/Modules/FindLibicnet.cmake  |  2 +-
 3 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 cmake/Modules/FindCURL.cmake
 create mode 100644 cmake/Modules/FindLibhicnet.cmake

(limited to 'cmake')

diff --git a/cmake/Modules/FindCURL.cmake b/cmake/Modules/FindCURL.cmake
new file mode 100644
index 00000000..239b0e50
--- /dev/null
+++ b/cmake/Modules/FindCURL.cmake
@@ -0,0 +1,69 @@
+#.rst:
+# FindCURL
+# --------
+#
+# Find curl
+#
+# Find the native CURL headers and libraries.
+#
+# ::
+#
+#   CURL_INCLUDE_DIRS   - where to find curl_/curl_.h, etc.
+#   CURL_LIBRARIES      - List of libraries when using curl.
+#   CURL_FOUND          - True if curl found.
+#   CURL_VERSION_STRING - the version of curl found (since CMake 2.8.8)
+
+#=============================================================================
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2012 Rolf Eike Beer <eike@sf-mail.de>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# Look for the header file.
+find_path(CURL_INCLUDE_DIR NAMES curl/curl.h)
+mark_as_advanced(CURL_INCLUDE_DIR)
+
+# Look for the library (sorted from most current/relevant entry to least).
+find_library(CURL_LIBRARY NAMES
+        curl
+        # Windows MSVC prebuilts:
+        curllib
+        libcurl_imp
+        curllib_static
+        # Windows older "Win32 - MSVC" prebuilts (libcurl.lib, e.g. libcurl-7.15.5-win32-msvc.zip):
+        libcurl
+        )
+mark_as_advanced(CURL_LIBRARY)
+
+if(CURL_INCLUDE_DIR)
+    foreach(_curl_version_header curlver.h curl.h)
+        if(EXISTS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}")
+            file(STRINGS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}" curl_version_str REGEX "^#define[\t ]+LIBCURL_VERSION[\t ]+\".*\"")
+
+            string(REGEX REPLACE "^#define[\t ]+LIBCURL_VERSION[\t ]+\"([^\"]*)\".*" "\\1" CURL_VERSION_STRING "${curl_version_str}")
+            unset(curl_version_str)
+            break()
+        endif()
+    endforeach()
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL
+        REQUIRED_VARS CURL_LIBRARY CURL_INCLUDE_DIR
+        VERSION_VAR CURL_VERSION_STRING)
+
+if(CURL_FOUND)
+    set(CURL_LIBRARIES ${CURL_LIBRARY})
+    set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
+endif()
diff --git a/cmake/Modules/FindLibhicnet.cmake b/cmake/Modules/FindLibhicnet.cmake
new file mode 100644
index 00000000..0d4f5fbc
--- /dev/null
+++ b/cmake/Modules/FindLibhicnet.cmake
@@ -0,0 +1,39 @@
+########################################
+#
+# Find the Libhicnet libraries and includes
+# This module sets:
+#  LIBHICNET_FOUND: True if Libconsumer-producer was found
+#  LIBHICNETR_LIBRARY:  The Libconsumer-producer library
+#  LIBHICNET_LIBRARIES:  The Libconsumer-producer library and dependencies
+#  LIBHICNET_INCLUDE_DIR:  The Libconsumer-producer include dir
+#
+
+set(LIBHICNET_SEARCH_PATH_LIST
+        ${LIBHICNET_HOME}
+        $ENV{LIBHICNETHOME}
+        $ENV{CCNX_HOME}
+        $ENV{PARC_HOME}
+        $ENV{FOUNDATION_HOME}
+        /usr/local/parc
+        /usr/local/ccnx
+        /usr/local/ccn
+        /usr/local
+        /opt
+        /usr
+        )
+
+find_path(LIBHICNET_INCLUDE_DIR hicnet/hicnet_core_common.h
+        HINTS ${LIBHICNET_SEARCH_PATH_LIST}
+        PATH_SUFFIXES include
+        DOC "Find the libhicnet includes")
+
+find_library(LIBHICNET_LIBRARY NAMES hicnet
+        HINTS ${LIBHICNET_SEARCH_PATH_LIST}
+        PATH_SUFFIXES lib
+        DOC "Find the libhicnet libraries")
+
+set(LIBHICNET_LIBRARIES ${LIBHICNET_LIBRARY})
+set(LIBHICNET_INCLUDE_DIRS ${LIBHICNET_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Libhicnet DEFAULT_MSG LIBHICNET_LIBRARY LIBHICNET_INCLUDE_DIR)
diff --git a/cmake/Modules/FindLibicnet.cmake b/cmake/Modules/FindLibicnet.cmake
index 3c9c4f5f..bfb81ef7 100644
--- a/cmake/Modules/FindLibicnet.cmake
+++ b/cmake/Modules/FindLibicnet.cmake
@@ -22,7 +22,7 @@ set(LIBICNET_SEARCH_PATH_LIST
         /usr
         )
 
-find_path(LIBICNET_INCLUDE_DIR icnet/icnet_common.h
+find_path(LIBICNET_INCLUDE_DIR icnet/icnet_ccnx_common.h
         HINTS ${LIBICNET_SEARCH_PATH_LIST}
         PATH_SUFFIXES include
         DOC "Find the libicnet includes")
-- 
cgit 1.2.3-korg