4 files changed, 5 insertions, 207 deletions
diff --git a/peripheral/libmraa/cmake/modules/FindJSON-C.cmake b/peripheral/libmraa/cmake/modules/FindJSON-C.cmake
deleted file mode 100644
index dd8a418..0000000
--- a/peripheral/libmraa/cmake/modules/FindJSON-C.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# JSON-C_FOUND - true if library and headers were found
-# JSON-C_INCLUDE_DIRS - include directories
-# JSON-C_LIBRARIES - library directories
-
-find_package (PkgConfig)
-pkg_check_modules (PC_JSON-C QUIET json-c)
-
-find_path (JSON-C_INCLUDE_DIR json.h HINTS ${PC_JSON-C_INCLUDEDIR}
-${PC_JSON-C_INCLUDE_DIRS} PATH_SUFFIXES json-c json)
-
-find_library (JSON-C_LIBRARY NAMES json-c libjson-c HINTS ${PC_JSON-C_LIBDIR}
-${PC_JSON-C_LIBRARY_DIRS})
-
-set (JSON-C_LIBRARIES ${JSON-C_LIBRARY})
-set (JSON-C_INCLUDE_DIRS ${JSON-C_INCLUDE_DIR})
-
-include (FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args (JSON-C DEFAULT_MSG JSON-C_LIBRARY JSON-C_INCLUDE_DIR)
-
-mark_as_advanced (JSON-C_INCLUDE_DIR JSON-C_LIBRARY)
diff --git a/peripheral/libmraa/cmake/modules/FindNodejs.cmake b/peripheral/libmraa/cmake/modules/FindNodejs.cmake
index 11e4363..5030768 100644
--- a/peripheral/libmraa/cmake/modules/FindNodejs.cmake
+++ b/peripheral/libmraa/cmake/modules/FindNodejs.cmake
@@ -23,13 +23,13 @@ if (UV_ROOT_DIR)
 endif()
 
 # Now look for node. Flag an error if not found
-find_path (NODE_ROOT_DIR "include/node/node.h" "include/src/node.h"
+find_path (NODE_ROOT_DIR "node/node.h" "src/node.h"
   PATHS /usr/include/nodejs /usr/local/include/nodejs /usr/local/include)
 if (NODE_ROOT_DIR)
-  add_include_dir(${NODE_ROOT_DIR}/include/src)
-  add_include_dir(${NODE_ROOT_DIR}/include/node)
-  add_include_dir(${NODE_ROOT_DIR}/include/deps/v8/include)
-  add_include_dir(${NODE_ROOT_DIR}/include/deps/uv/include)
+  add_include_dir(${NODE_ROOT_DIR}/src)
+  add_include_dir(${NODE_ROOT_DIR}/node)
+  add_include_dir(${NODE_ROOT_DIR}/deps/v8/include)
+  add_include_dir(${NODE_ROOT_DIR}/deps/uv/include)
 else()
   unset(NODEJS_INCLUDE_DIRS)
   message(ERROR " - node.h not found")
diff --git a/peripheral/libmraa/cmake/modules/FindUDEV.cmake b/peripheral/libmraa/cmake/modules/FindUDEV.cmake
deleted file mode 100644
index b169671..0000000
--- a/peripheral/libmraa/cmake/modules/FindUDEV.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# UDEV_FOUND - true if library and headers were found
-# UDEV_INCLUDE_DIRS - include directories
-# UDEV_LIBRARIES - library directories
-
-find_package (PkgConfig)
-pkg_check_modules (PC_UDEV QUIET udev)
-
-find_path (UDEV_INCLUDE_DIR libudev.h HINTS ${PC_UDEV_INCLUDEDIR}
-${PC_UDEV_INCLUDE_DIRS} PATH_SUFFIXES udev)
-
-find_library (UDEV_LIBRARY NAMES udev libudev HINTS ${PC_UDEV_LIBDIR}
-${PC_UDEV_LIBRARY_DIRS})
-
-set (UDEV_LIBRARIES ${UDEV_LIBRARY})
-set (UDEV_INCLUDE_DIRS ${UDEV_INCLUDE_DIR})
-
-include (FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args (UDEV DEFAULT_MSG UDEV_LIBRARY UDEV_INCLUDE_DIR)
-
-mark_as_advanced (UDEV_INCLUDE_DIR UDEV_LIBRARY)
diff --git a/peripheral/libmraa/cmake/modules/OpenCVDetectPython.cmake b/peripheral/libmraa/cmake/modules/OpenCVDetectPython.cmake
deleted file mode 100644
index e3fc3a9..0000000
--- a/peripheral/libmraa/cmake/modules/OpenCVDetectPython.cmake
+++ /dev/null
@@ -1,160 +0,0 @@
-# Find specified Python version
-# Arguments:
-#   preferred_version (value): Version to check for first
-#   min_version (value): Minimum supported version
-#   library_env (value): Name of Python library ENV variable to check
-#   include_dir_env (value): Name of Python include directory ENV variable to check
-#   found (variable): Set if interpreter found
-#   executable (variable): Output of executable found
-#   version_string (variable): Output of found version
-#   version_major (variable): Output of found major version
-#   version_minor (variable): Output of found minor version
-#   libs_found (variable): Set if libs found
-#   libs_version_string (variable): Output of found libs version
-#   libraries (variable): Output of found Python libraries
-#   library (variable): Output of found Python library
-#   debug_libraries (variable): Output of found Python debug libraries
-#   debug_library (variable): Output of found Python debug library
-#   include_path (variable): Output of found Python include path
-#   include_dir (variable): Output of found Python include dir
-#   include_dir2 (variable): Output of found Python include dir2
-#   packages_path (variable): Output of found Python packages path
-function(find_python preferred_version min_version library_env include_dir_env
-         found executable version_string version_major version_minor
-         libs_found libs_version_string libraries library debug_libraries
-         debug_library include_path include_dir include_dir2 packages_path)
-if(NOT ${found})
-  if(${executable})
-    set(PYTHON_EXECUTABLE "${${executable}}")
-  endif()
-
-  find_package(PythonInterp "${preferred_version}")
-  if(NOT PYTHONINTERP_FOUND)
-    find_package(PythonInterp "${min_version}")
-  endif()
-
-  if(PYTHONINTERP_FOUND)
-    # Copy outputs
-    set(_found ${PYTHONINTERP_FOUND})
-    set(_executable ${PYTHON_EXECUTABLE})
-    set(_version_string ${PYTHON_VERSION_STRING})
-    set(_version_major ${PYTHON_VERSION_MAJOR})
-    set(_version_minor ${PYTHON_VERSION_MINOR})
-    set(_version_patch ${PYTHON_VERSION_PATCH})
-
-    # Clear find_host_package side effects
-    unset(PYTHONINTERP_FOUND)
-    unset(PYTHON_EXECUTABLE CACHE)
-    unset(PYTHON_VERSION_STRING)
-    unset(PYTHON_VERSION_MAJOR)
-    unset(PYTHON_VERSION_MINOR)
-    unset(PYTHON_VERSION_PATCH)
-  endif()
-
-  if(_found)
-    set(_version_major_minor "${_version_major}.${_version_minor}")
-
-    if(NOT ANDROID AND NOT APPLE_FRAMEWORK)
-      # not using _version_string here, because it might not conform to the CMake version format
-      if(CMAKE_CROSSCOMPILING)
-        # builder version can differ from target, matching base version (e.g. 2.7)
-        find_package(PythonLibs "${_version_major_minor}")
-      else()
-        find_package(PythonLibs "${_version_major_minor}.${_version_patch}" EXACT)
-      endif()
-
-      if(PYTHONLIBS_FOUND)
-        # Copy outputs
-        set(_libs_found ${PYTHONLIBS_FOUND})
-        set(_libraries ${PYTHON_LIBRARIES})
-        set(_include_path ${PYTHON_INCLUDE_PATH})
-        set(_include_dirs ${PYTHON_INCLUDE_DIRS})
-        set(_debug_libraries ${PYTHON_DEBUG_LIBRARIES})
-        set(_libs_version_string ${PYTHONLIBS_VERSION_STRING})
-        set(_debug_library ${PYTHON_DEBUG_LIBRARY})
-        set(_library ${PYTHON_LIBRARY})
-        set(_library_debug ${PYTHON_LIBRARY_DEBUG})
-        set(_library_release ${PYTHON_LIBRARY_RELEASE})
-        set(_include_dir ${PYTHON_INCLUDE_DIR})
-        set(_include_dir2 ${PYTHON_INCLUDE_DIR2})
-
-        # Clear find_package side effects
-        unset(PYTHONLIBS_FOUND)
-        unset(PYTHON_LIBRARIES)
-        unset(PYTHON_INCLUDE_PATH)
-        unset(PYTHON_INCLUDE_DIRS)
-        unset(PYTHON_DEBUG_LIBRARIES)
-        unset(PYTHONLIBS_VERSION_STRING)
-        unset(PYTHON_DEBUG_LIBRARY CACHE)
-        unset(PYTHON_LIBRARY)
-        unset(PYTHON_LIBRARY_DEBUG)
-        unset(PYTHON_LIBRARY_RELEASE)
-        unset(PYTHON_LIBRARY CACHE)
-        unset(PYTHON_LIBRARY_DEBUG CACHE)
-        unset(PYTHON_LIBRARY_RELEASE CACHE)
-        unset(PYTHON_INCLUDE_DIR CACHE)
-        unset(PYTHON_INCLUDE_DIR2 CACHE)
-      endif()
-    endif()
-
-    execute_process(COMMAND ${_executable} -c "from distutils.sysconfig import *; print(get_python_lib())"
-                    RESULT_VARIABLE _cvpy_process
-                    OUTPUT_VARIABLE _std_packages_path
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if("${_std_packages_path}" MATCHES "site-packages")
-      set(_packages_path "python${_version_major_minor}/site-packages")
-    else() #debian based assumed, install to the dist-packages.
-      set(_packages_path "python${_version_major_minor}/dist-packages")
-    endif()
-      if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${${packages_path}}")
-        set(_packages_path "lib${LIB_SUFFIX}/${_packages_path}")
-      else()
-        set(_packages_path "lib/${_packages_path}")
-    endif()
-  endif()
-
-  # Export return values
-  set(${found} "${_found}" CACHE INTERNAL "")
-  set(${executable} "${_executable}" CACHE FILEPATH "Path to Python interpretor")
-  set(${version_string} "${_version_string}" CACHE INTERNAL "")
-  set(${version_major} "${_version_major}" CACHE INTERNAL "")
-  set(${version_minor} "${_version_minor}" CACHE INTERNAL "")
-  set(${libs_found} "${_libs_found}" CACHE INTERNAL "")
-  set(${libs_version_string} "${_libs_version_string}" CACHE INTERNAL "")
-  set(${libraries} "${_libraries}" CACHE INTERNAL "Python libraries")
-  set(${library} "${_library}" CACHE FILEPATH "Path to Python library")
-  set(${debug_libraries} "${_debug_libraries}" CACHE INTERNAL "")
-  set(${debug_library} "${_debug_library}" CACHE FILEPATH "Path to Python debug")
-  set(${include_path} "${_include_path}" CACHE INTERNAL "")
-  set(${include_dir} "${_include_dir}" CACHE PATH "Python include dir")
-  set(${include_dir2} "${_include_dir2}" CACHE PATH "Python include dir 2")
-  set(${packages_path} "${_packages_path}" CACHE PATH "Where to install the python packages.")
-endif()
-endfunction(find_python)
-
-set(MIN_VER_PYTHON2 2.7)
-set(MIN_VER_PYTHON3 3.2)
-
-find_python(2.7 "${MIN_VER_PYTHON2}" PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR
-    PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING
-    PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND
-    PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY
-    PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH
-    PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH)
-
-find_python(3 "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR
-    PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING
-    PYTHON3_VERSION_MAJOR PYTHON3_VERSION_MINOR PYTHON3LIBS_FOUND
-    PYTHON3LIBS_VERSION_STRING PYTHON3_LIBRARIES PYTHON3_LIBRARY
-    PYTHON3_DEBUG_LIBRARIES PYTHON3_LIBRARY_DEBUG PYTHON3_INCLUDE_PATH
-    PYTHON3_INCLUDE_DIR PYTHON3_INCLUDE_DIR2 PYTHON3_PACKAGES_PATH)
-
-if(PYTHON_DEFAULT_EXECUTABLE)
-    set(PYTHON_DEFAULT_AVAILABLE "TRUE")
-elseif(PYTHON2INTERP_FOUND) # Use Python 2 as default Python interpreter
-    set(PYTHON_DEFAULT_AVAILABLE "TRUE")
-    set(PYTHON_DEFAULT_EXECUTABLE "${PYTHON2_EXECUTABLE}")
-elseif(PYTHON3INTERP_FOUND) # Use Python 2 as fallback Python interpreter (if there is no Python 2)
-    set(PYTHON_DEFAULT_AVAILABLE "TRUE")
-    set(PYTHON_DEFAULT_EXECUTABLE "${PYTHON3_EXECUTABLE}")
-endif()