aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorcslashm <cslashm@gmail.com>2018-08-01 09:24:53 +0200
committercslashm <cslashm@gmail.com>2018-09-24 21:57:42 +0200
commitbb6e3bbc0f0a6c4ac126f56ba75b39d0dfac01a6 (patch)
tree7c6e03ce2a27685b09bf65a06536113d954b574e /cmake
parentMerge pull request #4429 (diff)
downloadmonero-bb6e3bbc0f0a6c4ac126f56ba75b39d0dfac01a6.tar.xz
Replace USB-CCID (smartcard) by USB-HID
Remove PCSC dependencies which is a bit hard (not user friendly) to install on linux and Mac Split Ledger logic and device IO
Diffstat (limited to 'cmake')
-rw-r--r--cmake/FindHIDAPI.cmake46
-rw-r--r--cmake/FindPCSC.cmake54
2 files changed, 46 insertions, 54 deletions
diff --git a/cmake/FindHIDAPI.cmake b/cmake/FindHIDAPI.cmake
new file mode 100644
index 000000000..a689fb4eb
--- /dev/null
+++ b/cmake/FindHIDAPI.cmake
@@ -0,0 +1,46 @@
+# - try to find HIDAPI library
+# from http://www.signal11.us/oss/hidapi/
+#
+# Cache Variables: (probably not for direct use in your scripts)
+# HIDAPI_INCLUDE_DIR
+# HIDAPI_LIBRARY
+#
+# Non-cache variables you might use in your CMakeLists.txt:
+# HIDAPI_FOUND
+# HIDAPI_INCLUDE_DIRS
+# HIDAPI_LIBRARIES
+#
+# Requires these CMake modules:
+# FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+find_library(HIDAPI_LIBRARY
+ NAMES hidapi hidapi-libusb)
+
+find_path(HIDAPI_INCLUDE_DIR
+ NAMES hidapi.h
+ PATH_SUFFIXES
+ hidapi)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(HIDAPI
+ DEFAULT_MSG
+ HIDAPI_LIBRARY
+ HIDAPI_INCLUDE_DIR)
+
+if(HIDAPI_FOUND)
+ set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARY}")
+
+ set(HIDAPI_INCLUDE_DIRS "${HIDAPI_INCLUDE_DIR}")
+endif()
+
+mark_as_advanced(HIDAPI_INCLUDE_DIR HIDAPI_LIBRARY)
diff --git a/cmake/FindPCSC.cmake b/cmake/FindPCSC.cmake
deleted file mode 100644
index 081919655..000000000
--- a/cmake/FindPCSC.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-# - Find PCSC
-# Find the native PCSC includes and library
-#
-# PCSC_INCLUDE_DIR - where to find winscard.h, wintypes.h, etc.
-# PCSC_LIBRARIES - List of libraries when using PCSC.
-# PCSC_FOUND - True if PCSC found.
-
-
-IF (PCSC_INCLUDE_DIR AND PCSC_LIBRARIES)
- # Already in cache, be silent
- SET(PCSC_FIND_QUIETLY TRUE)
-ENDIF (PCSC_INCLUDE_DIR AND PCSC_LIBRARIES)
-
-IF (NOT WIN32)
- FIND_PACKAGE(PkgConfig)
- PKG_CHECK_MODULES(PC_PCSC libpcsclite)
-
- FIND_PATH(PCSC_INCLUDE_DIR winscard.h
- HINTS
- /usr/include/PCSC
- ${PC_PCSC_INCLUDEDIR}
- ${PC_PCSC_INCLUDE_DIRS}
- PATH_SUFFIXES PCSC
- )
-
- FIND_LIBRARY(PCSC_LIBRARY NAMES pcsclite libpcsclite PCSC
- HINTS
- ${PC_PCSC_LIBDIR}
- ${PC_PCSC_LIBRARY_DIRS}
- )
-
-ELSE (NOT WIN32)
- IF(BUILD_64 STREQUAL "ON")
- set(PCSC_INCLUDE_DIR /mingw64/x86_64-w64-mingw32/include)
- set(PCSC_LIBRARY /mingw64/x86_64-w64-mingw32/lib/libwinscard.a)
- ELSE(BUILD_64 STREQUAL "ON")
- set(PCSC_INCLUDE_DIR /mingw32/i686-w64-mingw32/include)
- set(PCSC_LIBRARY /mingw32/i686-w64-mingw32/lib/libwinscard.a)
- ENDIF(BUILD_64 STREQUAL "ON")
-ENDIF (NOT WIN32)
-
-# handle the QUIETLY and REQUIRED arguments and set PCSC_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCSC DEFAULT_MSG PCSC_LIBRARY PCSC_INCLUDE_DIR)
-
-IF(PCSC_FOUND)
- SET( PCSC_LIBRARIES ${PCSC_LIBRARY} )
- SET(PCSC_STATIC_LIBRARIES ${PCSC_STATIC_LIBRARY})
-ELSE(PCSC_FOUND)
- SET( PCSC_LIBRARIES )
-ENDIF(PCSC_FOUND)
-
-MARK_AS_ADVANCED( PCSC_LIBRARY PCSC_INCLUDE_DIR PCSC_STATIC_LIBRARY)