update android-sdk. Now it is possible to compile with clangandroid-sdk/master

Change-Id: I156aa48dd90467a2a7540eec11839c0111b13bd2
Signed-off-by: Angelo Mantellini <angelo.mantellini@irt-systemx.fr>

14 files changed, 583 insertions, 0 deletions

diff --git a/HttpServer/app/cmake/Modules/FindCCNX_Common.cmake b/HttpServer/app/cmake/Modules/FindCCNX_Common.cmake
new file mode 100644
index 00000000..da5a4119
--- /dev/null
+++ b/HttpServer/app/cmake/Modules/FindCCNX_Common.cmake
@@ -0,0 +1,52 @@
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+########################################
+#
+# Find the Libparc libraries and includes
+# This module sets:
+#  CCNX_COMMON_FOUND: True if Libparc was found
+#  CCNX_COMMON_LIBRARY:  The Libparc library
+#  CCNX_COMMON_LIBRARIES:  The Libparc library and dependencies
+#  CCNX_COMMON_INCLUDE_DIR:  The Libparc include dir
+#
+
+set(CCNX_COMMON_SEARCH_PATH_LIST
+        ${CCNX_COMMON_HOME}
+        $ENV{CCNX_COMMON_HOME}
+        $ENV{CCNX_HOME}
+        $ENV{PARC_HOME}
+        $ENV{FOUNDATION_HOME}
+        /usr/local/parc
+        /usr/local/ccnx
+        /usr/local/ccn
+        /usr/local
+        /opt
+        /usr
+        )
+
+find_path(CCNX_COMMON_INCLUDE_DIR ccnx/common/libccnxCommon_About.h
+        HINTS ${CCNX_COMMON_SEARCH_PATH_LIST}
+        PATH_SUFFIXES include
+        DOC "Find the Libccnx-common includes")
+
+find_library(CCNX_COMMON_LIBRARY NAMES ccnx_common
+        HINTS ${CCNX_COMMON_SEARCH_PATH_LIST}
+        PATH_SUFFIXES lib
+        DOC "Find the Libccnx-common libraries")
+
+set(CCNX_COMMON_LIBRARIES ${CCNX_COMMON_LIBRARY})
+set(CCNX_COMMON_INCLUDE_DIRS ${CCNX_COMMON_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CCNX_Common DEFAULT_MSG CCNX_COMMON_LIBRARY CCNX_COMMON_INCLUDE_DIR)
diff --git a/HttpServer/app/cmake/Modules/FindCCNX_Portal.cmake b/HttpServer/app/cmake/Modules/FindCCNX_Portal.cmake
new file mode 100644
index 00000000..d7aa9066
--- /dev/null
+++ b/HttpServer/app/cmake/Modules/FindCCNX_Portal.cmake
@@ -0,0 +1,53 @@
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+########################################
+#
+# Find the Libccnx-transport libraries and includes
+# This module sets:
+#  CCNX_PORTAL_FOUND: True if Libparc was found
+#  CCNX_PORTAL_LIBRARY:  The Libparc library
+#  CCNX_PORTAL_LIBRARIES:  The Libparc library and dependencies
+#  CCNX_PORTAL_INCLUDE_DIR:  The Libparc include dir
+#
+
+set(CCNX_PORTAL_SEARCH_PATH_LIST
+        ${CCNX_PORTAL_HOME}
+        $ENV{CCNX_PORTAL_HOME}
+        $ENV{CCNX_HOME}
+        $ENV{PARC_HOME}
+        $ENV{FOUNDATION_HOME}
+        /usr/local/parc
+        /usr/local/ccnx
+        /usr/local/ccn
+        /usr/local
+        /opt
+        /usr
+        )
+
+find_path(CCNX_PORTAL_INCLUDE_DIR ccnx/api/ccnx_Portal/ccnxPortal_About.h
+        HINTS ${CCNX_PORTAL_SEARCH_PATH_LIST}
+        PATH_SUFFIXES include
+        DOC "Find the Libccnx-portal includes")
+
+find_library(CCNX_PORTAL_LIBRARY NAMES ccnx_api_portal
+        HINTS ${CCNX_PORTAL_SEARCH_PATH_LIST}
+        PATH_SUFFIXES lib
+        DOC "Find the Libccnx-portal libraries")
+
+set(CCNX_PORTAL_LIBRARIES ${CCNX_PORTAL_LIBRARY})
+
+set(CCNX_PORTAL_INCLUDE_DIRS ${CCNX_PORTAL_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CCNX_Portal DEFAULT_MSG CCNX_PORTAL_LIBRARY CCNX_PORTAL_INCLUDE_DIR)
diff --git a/HttpServer/app/cmake/Modules/FindCCNX_Transport_Rta.cmake b/HttpServer/app/cmake/Modules/FindCCNX_Transport_Rta.cmake
new file mode 100644
index 00000000..bc0b0428
--- /dev/null
+++ b/HttpServer/app/cmake/Modules/FindCCNX_Transport_Rta.cmake
@@ -0,0 +1,63 @@
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+########################################
+#
+# Find the Libccnx-transport libraries and includes
+# This module sets:
+#  CCNX_TRANSPORT_RTA_FOUND: True if Libparc was found
+#  CCNX_TRANSPORT_RTA_LIBRARY:  The Libparc library
+#  CCNX_TRANSPORT_RTA_LIBRARIES:  The Libparc library and dependencies
+#  CCNX_TRANSPORT_RTA_INCLUDE_DIR:  The Libparc include dir
+#
+
+set(CCNX_TRANSPORT_RTA_SEARCH_PATH_LIST
+        ${CCNX_TRANSPORT_RTA_HOME}
+        $ENV{CCNX_TRANSPORT_RTA_HOME}
+        $ENV{CCNX_HOME}
+        $ENV{PARC_HOME}
+        $ENV{FOUNDATION_HOME}
+        /usr/local/parc
+        /usr/local/ccnx
+        /usr/local/ccn
+        /usr/local
+        /opt
+        /usr
+        )
+
+find_path(CCNX_TRANSPORT_RTA_INCLUDE_DIR ccnx/transport/librta_About.h
+        HINTS ${CCNX_TRANSPORT_RTA_SEARCH_PATH_LIST}
+        PATH_SUFFIXES include
+        DOC "Find the Libccnx-transport-rta includes")
+
+find_library(CCNX_TRANSPORT_RTA_LIBRARY NAMES ccnx_transport_rta
+        HINTS ${CCNX_TRANSPORT_RTA_SEARCH_PATH_LIST}
+        PATH_SUFFIXES lib
+        DOC "Find the Libccnx-transport-rta libraries")
+
+find_library(CCNX_API_NOTIFY_LIBRARY NAMES ccnx_api_notify
+        HINTS ${CCNX_TRANSPORT_RTA_SEARCH_PATH_LIST}
+        PATH_SUFFIXES lib
+        DOC "Find the Libccnx-transport-rta libraries")
+
+find_library(CCNX_API_CONTROL_LIBRARY NAMES ccnx_api_control
+        HINTS ${CCNX_TRANSPORT_RTA_SEARCH_PATH_LIST}
+        PATH_SUFFIXES lib
+        DOC "Find the Libccnx-transport-rta libraries")
+
+set(CCNX_TRANSPORT_RTA_LIBRARIES ${CCNX_TRANSPORT_RTA_LIBRARY} ${CCNX_API_CONTROL_LIBRARY} ${CCNX_API_NOTIFY_LIBRARY})
+
+set(CCNX_TRANSPORT_RTA_INCLUDE_DIRS ${CCNX_TRANSPORT_RTA_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CCNX_Transport_Api DEFAULT_MSG CCNX_TRANSPORT_RTA_LIBRARY CCNX_TRANSPORT_RTA_INCLUDE_DIR)
diff --git a/HttpServer/app/cmake/Modules/FindCURL.cmake b/HttpServer/app/cmake/Modules/FindCURL.cmake
new file mode 100644
index 00000000..239b0e50
--- /dev/null
+++ b/HttpServer/app/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/HttpServer/app/cmake/Modules/FindHttpServer.cmake b/HttpServer/app/cmake/Modules/FindHttpServer.cmake
new file mode 100644
index 00000000..263353fa
--- /dev/null
+++ b/HttpServer/app/cmake/Modules/FindHttpServer.cmake
@@ -0,0 +1,39 @@
+########################################
+#
+# Find the HttpServer libraries and includes
+# This module sets:
+#  LIB_HTTP_SERVER_FOUND: True if lib_http_server was found
+#  LIB_HTTP_SERVER_LIBRARY:  The lib_http_server library
+#  LIB_HTTP_SERVER_LIBRARIES:  The lib_http_server library and dependencies
+#  LIB_HTTP_SERVER_INCLUDE_DIR:  The lib_http_server include dir
+#
+
+set(LIBICN_HTTP_SERVER_SEARCH_PATH_LIST
+        ${HTTP_SERVER_HOME}
+        $ENV{HTTP_SERVER_HOME}
+        $ENV{CCNX_HOME}
+        $ENV{PARC_HOME}
+        $ENV{FOUNDATION_HOME}
+        /usr/local/http-server
+        /usr/local/ccnx
+        /usr/local/ccn
+        /usr/local
+        /opt
+        /usr
+        )
+
+find_path(LIB_HTTP_SERVER_INCLUDE_DIR http-server/http_server.h
+        HINTS ${LIBICN_HTTP_SERVER_SEARCH_PATH_LIST}
+        PATH_SUFFIXES include
+        DOC "Find the http-server includes")
+
+find_library(LIB_HTTP_SERVER_LIBRARY NAMES httpserver
+        HINTS ${LIB_HTTP_SERVER_SEARCH_PATH_LIST}
+        PATH_SUFFIXES lib
+        DOC "Find the http-server libraries")
+
+set(LIB_HTTP_SERVER_LIBRARIES ${LIB_HTTP_SERVER_LIBRARY})
+set(LIB_HTTP_SERVER_INCLUDE_DIRS ${LIB_HTTP_SERVER_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(lib_http_server DEFAULT_MSG LIB_HTTP_SERVER_LIBRARY LIB_HTTP_SERVER_INCLUDE_DIR)
diff --git a/HttpServer/app/cmake/Modules/FindJsoncpp.cmake b/HttpServer/app/cmake/Modules/FindJsoncpp.cmake
new file mode 100644
index 00000000..acde7b95
--- /dev/null
+++ b/HttpServer/app/cmake/Modules/FindJsoncpp.cmake
@@ -0,0 +1,47 @@
+# Find jsoncpp
+#
+# Find the jsoncpp includes and library
+#
+# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH
+#
+# This module defines
+#  JSONCPP_INCLUDE_DIRS, where to find header, etc.
+#  JSONCPP_LIBRARIES, the libraries needed to use jsoncpp.
+#  JSONCPP_FOUND, If false, do not try to use jsoncpp.
+#  JSONCPP_INCLUDE_PREFIX, include prefix for jsoncpp
+
+# only look in default directories
+find_path(
+        JSONCPP_INCLUDE_DIR
+        NAMES jsoncpp/json/json.h json/json.h
+        DOC "jsoncpp include dir"
+)
+
+find_library(
+        JSONCPP_LIBRARY
+        NAMES jsoncpp
+        DOC "jsoncpp library"
+)
+
+set(JSONCPP_INCLUDE_DIRS ${JSONCPP_INCLUDE_DIR})
+set(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
+
+# find JSONCPP_INCLUDE_PREFIX
+find_path(
+        JSONCPP_INCLUDE_PREFIX
+        NAMES json.h
+        PATH_SUFFIXES jsoncpp/json json
+)
+
+if (${JSONCPP_INCLUDE_PREFIX} MATCHES "jsoncpp")
+    set(JSONCPP_INCLUDE_PREFIX "jsoncpp/json")
+else()
+    set(JSONCPP_INCLUDE_PREFIX "json")
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set JSONCPP_FOUND to TRUE
+# if all listed variables are TRUE, hide their existence from configuration view
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(jsoncpp DEFAULT_MSG
+        JSONCPP_INCLUDE_DIR JSONCPP_LIBRARY)
+mark_as_advanced (JSONCPP_INCLUDE_DIR JSONCPP_LIBRARY)
\ No newline at end of file
diff --git a/HttpServer/app/cmake/Modules/FindLibEvent.cmake b/HttpServer/app/cmake/Modules/FindLibEvent.cmake
new file mode 100644
index 00000000..2d1ca4fe
--- /dev/null
+++ b/HttpServer/app/cmake/Modules/FindLibEvent.cmake
@@ -0,0 +1,47 @@
+########################################
+#
+# Find the LibEvent libraries and includes
+# This module sets:
+#  LIBEVENT_FOUND: True if LibEvent was found
+#  LIBEVENT_LIBRARY:  The LibEvent library
+#  LIBEVENT_LIBRARIES:  The LibEvent library and dependencies
+#  LIBEVENT_INCLUDE_DIR:  The LibEvent include dir
+#
+# This module will look for the libraries in various locations
+# See the LIBEVENT_SEARCH_PATH_LIST for a full list.
+#
+# The caller can hint at locations using the following variables:
+#
+# LIBEVENT_HOME (passed as -D to cmake)
+# CCNX_DEPENDENCIES (in environment)
+# LIBEVENT_HOME (in environment)
+# CCNX_HOME (in environment)
+#
+
+set(LIBEVENT_SEARCH_PATH_LIST
+  ${LIBEVENT_HOME} 
+  $ENV{CCNX_DEPENDENCIES} 
+  $ENV{LIBEVENT_HOME} 
+  $ENV{CCNX_HOME} 
+  /usr/local/ccnx 
+  /usr/local/ccn 
+  /usr/local 
+  /opt
+  /usr 
+  )
+
+find_path(LIBEVENT_INCLUDE_DIR event2/event.h
+  HINTS ${LIBEVENT_SEARCH_PATH_LIST}
+  PATH_SUFFIXES include 
+  DOC "Find the LibEvent includes" )
+	  
+find_library(LIBEVENT_LIBRARY NAMES event
+  HINTS ${LIBEVENT_SEARCH_PATH_LIST}
+  PATH_SUFFIXES lib 
+  DOC "Find the LibEvent libraries" )
+
+set(LIBEVENT_LIBRARIES ${LIBEVENT_LIBRARY})
+set(LIBEVENT_INCLUDE_DIRS ${LIBEVENT_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LibEvent  DEFAULT_MSG LIBEVENT_LIBRARY LIBEVENT_INCLUDE_DIR)
diff --git a/HttpServer/app/cmake/Modules/FindLibicnet.cmake b/HttpServer/app/cmake/Modules/FindLibicnet.cmake
new file mode 100644
index 00000000..bfb81ef7
--- /dev/null
+++ b/HttpServer/app/cmake/Modules/FindLibicnet.cmake
@@ -0,0 +1,39 @@
+########################################
+#
+# Find the Libparc libraries and includes
+# This module sets:
+#  LIBICNET_FOUND: True if Libconsumer-producer was found
+#  LIBICNETR_LIBRARY:  The Libconsumer-producer library
+#  LIBICNET_LIBRARIES:  The Libconsumer-producer library and dependencies
+#  LIBICNET_INCLUDE_DIR:  The Libconsumer-producer include dir
+#
+
+set(LIBICNET_SEARCH_PATH_LIST
+        ${LIBICNET_HOME}
+        $ENV{LIBICNETHOME}
+        $ENV{CCNX_HOME}
+        $ENV{PARC_HOME}
+        $ENV{FOUNDATION_HOME}
+        /usr/local/parc
+        /usr/local/ccnx
+        /usr/local/ccn
+        /usr/local
+        /opt
+        /usr
+        )
+
+find_path(LIBICNET_INCLUDE_DIR icnet/icnet_ccnx_common.h
+        HINTS ${LIBICNET_SEARCH_PATH_LIST}
+        PATH_SUFFIXES include
+        DOC "Find the libicnet includes")
+
+find_library(LIBICNET_LIBRARY NAMES icnet
+        HINTS ${LIBICNET_SEARCH_PATH_LIST}
+        PATH_SUFFIXES lib
+        DOC "Find the libicnet libraries")
+
+set(LIBICNET_LIBRARIES ${LIBICNET_LIBRARY})
+set(LIBICNET_INCLUDE_DIRS ${LIBICNET_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Libicnet DEFAULT_MSG LIBICNET_LIBRARY LIBICNET_INCLUDE_DIR)
diff --git a/HttpServer/app/cmake/Modules/FindLibparc.cmake b/HttpServer/app/cmake/Modules/FindLibparc.cmake
new file mode 100644
index 00000000..da8b3af7
--- /dev/null
+++ b/HttpServer/app/cmake/Modules/FindLibparc.cmake
@@ -0,0 +1,52 @@
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+########################################
+#
+# Find the Libparc libraries and includes
+# This module sets:
+#  LIBPARC_FOUND: True if Libparc was found
+#  LIBPARC_LIBRARY:  The Libparc library
+#  LIBPARC_LIBRARIES:  The Libparc library and dependencies
+#  LIBPARC_INCLUDE_DIR:  The Libparc include dir
+#
+
+set(LIBPARC_SEARCH_PATH_LIST
+        ${LIBPARC_HOME}
+        $ENV{LIBPARC_HOME}
+        $ENV{CCNX_HOME}
+        $ENV{PARC_HOME}
+        $ENV{FOUNDATION_HOME}
+        /usr/local/parc
+        /usr/local/ccnx
+        /usr/local/ccn
+        /usr/local
+        /opt
+        /usr
+        )
+
+find_path(LIBPARC_INCLUDE_DIR parc/libparc_About.h
+        HINTS ${LIBPARC_SEARCH_PATH_LIST}
+        PATH_SUFFIXES include
+        DOC "Find the Libparc includes")
+
+find_library(LIBPARC_LIBRARY NAMES parc
+        HINTS ${LIBPARC_SEARCH_PATH_LIST}
+        PATH_SUFFIXES lib
+        DOC "Find the Libparc libraries")
+
+set(LIBPARC_LIBRARIES ${LIBPARC_LIBRARY})
+set(LIBPARC_INCLUDE_DIRS ${LIBPARC_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Libparc DEFAULT_MSG LIBPARC_LIBRARY LIBPARC_INCLUDE_DIR)
diff --git a/HttpServer/app/cmake/Modules/FindLongBow.cmake b/HttpServer/app/cmake/Modules/FindLongBow.cmake
new file mode 100644
index 00000000..28d0b3b1
--- /dev/null
+++ b/HttpServer/app/cmake/Modules/FindLongBow.cmake
@@ -0,0 +1,58 @@
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+########################################
+#
+# Find the LongBow libraries and includes
+# This module sets:
+#  LONGBOW_FOUND: True if LongBow was found
+#  LONGBOW_LIBRARY:  The LongBow library
+#  LONGBOW_LIBRARIES:  The LongBow library and dependencies
+#  LONGBOW_INCLUDE_DIR:  The LongBow include dir
+#
+
+set(LONGBOW_SEARCH_PATH_LIST
+        ${LONGBOW_HOME}
+        $ENV{LONGBOW_HOME}
+        $ENV{CCNX_HOME}
+        $ENV{PARC_HOME}
+        $ENV{FOUNDATION_HOME}
+        /usr/local/parc
+        /usr/local/ccnx
+        /usr/local/ccn
+        /usr/local
+        /opt
+        /usr
+        )
+
+find_path(LONGBOW_INCLUDE_DIR LongBow/longBow_About.h
+        HINTS ${LONGBOW_SEARCH_PATH_LIST}
+        PATH_SUFFIXES include
+        DOC "Find the LongBow includes")
+
+find_library(LONGBOW_LIBRARY NAMES longbow
+        HINTS ${LONGBOW_SEARCH_PATH_LIST}
+        PATH_SUFFIXES lib
+        DOC "Find the LongBow libraries")
+
+find_library(LONGBOW_REPORT_LIBRARY NAMES longbow-textplain longbow-ansiterm
+        HINTS ${LONGBOW_SEARCH_PATH_LIST}
+        PATH_SUFFIXES lib
+        DOC "Find the LongBow report libraries")
+
+set(LONGBOW_LIBRARIES ${LONGBOW_LIBRARY} ${LONGBOW_REPORT_LIBRARY})
+set(LONGBOW_INCLUDE_DIRS ${LONGBOW_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LongBow DEFAULT_MSG LONGBOW_LIBRARY LONGBOW_INCLUDE_DIR)
diff --git a/HttpServer/app/cmake/Modules/FindUncrustify.cmake b/HttpServer/app/cmake/Modules/FindUncrustify.cmake
new file mode 100644
index 00000000..e53f65fe
--- /dev/null
+++ b/HttpServer/app/cmake/Modules/FindUncrustify.cmake
@@ -0,0 +1,8 @@
+# Find uncrustify program
+#
+find_program( UNCRUSTIFY_BIN uncrustify
+                PATHS
+				$ENV{UNCRUSTIFY_HOME}
+				)
+
+message( "-- UNCRUSTIFY found in ${UNCRUSTIFY_BIN}" )
diff --git a/HttpServer/app/cmake/Modules/detectCacheSize.cmake b/HttpServer/app/cmake/Modules/detectCacheSize.cmake
new file mode 100644
index 00000000..469d2627
--- /dev/null
+++ b/HttpServer/app/cmake/Modules/detectCacheSize.cmake
@@ -0,0 +1,21 @@
+# Detect the cache size
+#
+# XXX: TODO: This is a bug when cross compiling. We are detecting the local
+# Cache Line size and not the target cache line size.  We should provide some
+# way to define this
+
+set(LEVEL1_DCACHE_LINESIZE 32)
+
+if( APPLE ) 
+  execute_process(COMMAND sysctl -n hw.cachelinesize
+	OUTPUT_VARIABLE LEVEL1_DCACHE_LINESIZE 
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif( APPLE )
+
+if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
+  execute_process(COMMAND getconf LEVEL1_DCACHE_LINESIZE
+	OUTPUT_VARIABLE LEVEL1_DCACHE_LINESIZE 
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+
+message("-- Cache line size: ${LEVEL1_DCACHE_LINESIZE}")
diff --git a/HttpServer/app/cmake/Modules/version.cmake b/HttpServer/app/cmake/Modules/version.cmake
new file mode 100644
index 00000000..74831674
--- /dev/null
+++ b/HttpServer/app/cmake/Modules/version.cmake
@@ -0,0 +1,15 @@
+#
+# Get a version to pass on the command line
+#
+execute_process(COMMAND ${PROJECT_SOURCE_DIR}/cmake/get_version.sh ${PROJECT_SOURCE_DIR} 
+  OUTPUT_VARIABLE RELEASE_VERSION 
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+execute_process(COMMAND date -u +%Y-%m-%dT%H:%M:%SZ
+  OUTPUT_VARIABLE ISO_DATE 
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+MESSAGE( STATUS "Configuring version ${RELEASE_VERSION}" )
+
+add_definitions("-DRELEASE_VERSION=\"${RELEASE_VERSION}\"")
+
diff --git a/HttpServer/app/cmake/get_version.sh b/HttpServer/app/cmake/get_version.sh
new file mode 100755
index 00000000..34c6ddb2
--- /dev/null
+++ b/HttpServer/app/cmake/get_version.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+DATE_VERSION=`date "+%Y%m%d"`
+
+if [ ! -d $1 ]; then
+  echo 0.$DATE_VERSION
+  exit 
+fi
+
+if [ -f $1/BASE_VERSION ]; then
+  BASE_VERSION=`cat $1/BASE_VERSION`.
+fi
+
+GIT=`which git`
+    
+if test -x $GIT -a -f $1/.git/config; then 
+	GIT_VERSION=.`git -C $1 rev-parse HEAD | cut -c 1-8`
+fi
+
+echo $BASE_VERSION$DATE_VERSION$GIT_VERSION