From 6b549a526942a04e609e2d9da2dc67401811ed69 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Wed, 11 Jun 2014 00:43:33 -0700
Subject: [PATCH] Revert "Add LeapMotion SDK support"

This reverts commit 291c446c28fbe772b161cdb0246e1ebfef83ca84.
---
 cmake/modules/FindLeapMotion.cmake       | 44 ------------------------
 interface/CMakeLists.txt                 |  9 -----
 interface/external/leapmotion/readme.txt | 27 ---------------
 3 files changed, 80 deletions(-)
 delete mode 100644 cmake/modules/FindLeapMotion.cmake
 delete mode 100644 interface/external/leapmotion/readme.txt

diff --git a/cmake/modules/FindLeapMotion.cmake b/cmake/modules/FindLeapMotion.cmake
deleted file mode 100644
index d1c0c81773..0000000000
--- a/cmake/modules/FindLeapMotion.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-#  Try to find the LeapMotion library
-#
-#  You must provide a LEAPMOTION_ROOT_DIR which contains lib and include directories
-#
-#  Once done this will define
-#
-#  LEAPMOTION_FOUND - system found LEAPMOTION
-#  LEAPMOTION_INCLUDE_DIRS - the LEAPMOTION include directory
-#  LEAPMOTION_LIBRARIES - Link this to use LEAPMOTION
-#
-#  Created on 6/2/2014 by Sam Cake
-#  Copyright (c) 2014 High Fidelity
-#
-
-if (LEAPMOTION_LIBRARIES AND LEAPMOTION_INCLUDE_DIRS)
-  # in cache already
-  set(LEAPMOTION_FOUND TRUE)
-else (LEAPMOTION_LIBRARIES AND LEAPMOTION_INCLUDE_DIRS)
-  set(LEAPMOTION_SEARCH_DIRS "${LEAPMOTION_ROOT_DIR}" "$ENV{HIFI_LIB_DIR}/leapmotion")
-
-  find_path(LEAPMOTION_INCLUDE_DIRS Leap.h ${LEAPMOTION_ROOT_DIR}/include)
-
-  if (WIN32)
-    find_library(LEAPMOTION_LIBRARIES Leap.lib ${LEAPMOTION_ROOT_DIR}/lib/x86)
-  endif (WIN32)
- 
-  if (LEAPMOTION_INCLUDE_DIRS AND LEAPMOTION_LIBRARIES)
-    set(LEAPMOTION_FOUND TRUE)
-  endif (LEAPMOTION_INCLUDE_DIRS AND LEAPMOTION_LIBRARIES)
-
-  if (LEAPMOTION_FOUND)
-    if (NOT LEAPMOTION_FIND_QUIETLY)
-      message(STATUS "Found LEAPMOTION... ${LEAPMOTION_LIBRARIES}")
-    endif (NOT LEAPMOTION_FIND_QUIETLY)
-  else ()
-    if (LEAPMOTION_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find LEAPMOTION")
-    endif (LEAPMOTION_FIND_REQUIRED)
-  endif ()
-
-  # show the LEAPMOTION_INCLUDE_DIRS and LEAPMOTION_LIBRARIES variables only in the advanced view
-  mark_as_advanced(LEAPMOTION_INCLUDE_DIRS LEAPMOTION_LIBRARIES)
-
-endif (LEAPMOTION_LIBRARIES AND LEAPMOTION_INCLUDE_DIRS)
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 44fd8fd5d1..cf203c41d9 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -18,7 +18,6 @@ set(LIBOVR_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/oculus")
 set(PRIOVR_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/priovr")
 set(SIXENSE_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/Sixense")
 set(VISAGE_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/visage")
-set(LEAPMOTION_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/leapmotion")
 
 find_package(Qt5LinguistTools REQUIRED)
 find_package(Qt5LinguistToolsMacros)
@@ -139,7 +138,6 @@ find_package(PrioVR)
 find_package(SDL)
 find_package(Sixense)
 find_package(Visage)
-find_package(LeapMotion)
 find_package(ZLIB)
 find_package(Qxmpp)
 
@@ -195,13 +193,6 @@ if (PRIOVR_FOUND AND NOT DISABLE_PRIOVR)
     target_link_libraries(${TARGET_NAME} "${PRIOVR_LIBRARIES}")
 endif (PRIOVR_FOUND AND NOT DISABLE_PRIOVR)
 
-# and with LeapMotion library
-if (LEAPMOTION_FOUND AND NOT DISABLE_LEAPMOTION)
-    add_definitions(-DHAVE_LEAPMOTION)
-    include_directories(SYSTEM "${LEAPMOTION_INCLUDE_DIRS}")
-    target_link_libraries(${TARGET_NAME} "${LEAPMOTION_LIBRARIES}")
-endif (LEAPMOTION_FOUND AND NOT DISABLE_LEAPMOTION)
-
 # and with SDL for joysticks
 if (SDL_FOUND AND NOT DISABLE_SDL)
     add_definitions(-DHAVE_SDL)
diff --git a/interface/external/leapmotion/readme.txt b/interface/external/leapmotion/readme.txt
deleted file mode 100644
index 3abad9d7b1..0000000000
--- a/interface/external/leapmotion/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-
-Instructions for adding the Leap Motion library (LeapSDK) to Interface
-Sam Cake, June 10, 2014
-
-You can download the Leap Developer Kit from https://developer.leapmotion.com/ (account creation required). Interface has been tested with SDK version LeapDeveloperKit_2.0.2+16391_win.
-
-1. Copy the LeapSDK folders from the LeapDeveloperKit installation directory (Lib, Include) into the interface/externals/leapmotion folder.
-   This readme.txt should be there as well.
-   
-   The files neeeded in the folders are:
-   
-   include/
-   - Leap.h
-   - Leap.i
-   - LeapMath.h
-   
-   lib/
-     x86/
-     - Leap.dll
-     - Leap.lib
-     - mscvcp120.dll (optional if you already have the Msdev 2012 SDK redistriuable installed)
-     - mscvcr120.dll (optional if you already have the Msdev 2012 SDK redistriuable installed)
-   
-   You may optionally choose to copy the SDK folders to a location outside the repository (so you can re-use with different checkouts and different projects). 
-   If so our CMake find module expects you to set the ENV variable 'HIFI_LIB_DIR' to a directory containing a subfolder 'leapmotion' that contains the 2 folders mentioned above (Include, Lib).
-    
-2. Clear your build directory, run cmake and build, and you should be all set.
\ No newline at end of file