diff --git a/CMakeLists.txt b/CMakeLists.txt index 54c5f035..b1433e64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,18 +137,6 @@ endif() find_library(SODIUM_LIBRARY sodium) message(STATUS "libsodium: libraries at ${SODIUM_LIBRARY}") -# LibUSB -find_package(LibUSB) -message(STATUS "libusb: include dir at ${LibUSB_INCLUDE_DIRS}") -message(STATUS "libusb: libraries at ${LibUSB_LIBRARIES}") - -# HIDApi -if(NOT ANDROID) - find_package(HIDAPI REQUIRED) - message(STATUS "libhidapi: include dir at ${HIDAPI_INCLUDE_DIRS}") - message(STATUS "libhidapi: libraries at ${HIDAPI_LIBRARIES}") -endif() - # Boost if(DEBUG) set(Boost_DEBUG ON) @@ -541,25 +529,5 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}") -if (HIDAPI_FOUND OR LibUSB_COMPILE_TEST_PASSED) - if (APPLE) - if(DEPENDS) - list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework IOKit") - else() - find_library(COREFOUNDATION CoreFoundation) - find_library(IOKIT IOKit) - list(APPEND EXTRA_LIBRARIES ${IOKIT}) - list(APPEND EXTRA_LIBRARIES ${COREFOUNDATION}) - endif() - endif() - if (WIN32) - find_library(VERSION_LIBRARY version PATHS /usr/x86_64-w64-mingw32/lib) - if(VERSION_LIBRARY STREQUAL "VERSION_LIBRARY-NOTFOUND") - set(VERSION_LIBRARY Version) - endif() - list(APPEND EXTRA_LIBRARIES setupapi ${VERSION_LIBRARY}) - endif() -endif() - add_subdirectory(translations) add_subdirectory(src) diff --git a/cmake/FindHIDAPI.cmake b/cmake/FindHIDAPI.cmake deleted file mode 100644 index 9b45dcc4..00000000 --- a/cmake/FindHIDAPI.cmake +++ /dev/null @@ -1,60 +0,0 @@ -# - 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 -# 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}") - if((STATIC AND UNIX AND NOT APPLE) OR (DEPENDS AND CMAKE_SYSTEM_NAME STREQUAL "Linux")) - find_library(LIBUSB-1.0_LIBRARY usb-1.0) - find_library(LIBUDEV_LIBRARY udev) - if(LIBUSB-1.0_LIBRARY) - set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARIES};${LIBUSB-1.0_LIBRARY}") - if(LIBUDEV_LIBRARY) - set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARIES};${LIBUDEV_LIBRARY}") - else() - message(WARNING "libudev library not found, binaries may fail to link.") - endif() - else() - message(WARNING "libusb-1.0 library not found, binaries may fail to link.") - endif() - endif() - - set(HIDAPI_INCLUDE_DIRS "${HIDAPI_INCLUDE_DIR}") -endif() - -mark_as_advanced(HIDAPI_INCLUDE_DIR HIDAPI_LIBRARY) diff --git a/cmake/FindLibUSB.cmake b/cmake/FindLibUSB.cmake deleted file mode 100644 index c7e09d4c..00000000 --- a/cmake/FindLibUSB.cmake +++ /dev/null @@ -1,149 +0,0 @@ -# - Find libusb for portable USB support -# This module will find libusb as published by -# http://libusb.sf.net and -# http://libusb-win32.sf.net -# -# It will use PkgConfig if present and supported, else search -# it on its own. If the LibUSB_ROOT_DIR environment variable -# is defined, it will be used as base path. -# The following standard variables get defined: -# LibUSB_FOUND: true if LibUSB was found -# LibUSB_HEADER_FILE: the location of the C header file -# LibUSB_INCLUDE_DIRS: the directory that contains the include file -# LibUSB_LIBRARIES: the library -# source: https://github.com/IntelRealSense/librealsense - -include ( CheckLibraryExists ) -include ( CheckIncludeFile ) - -find_package ( PkgConfig ) -if ( PKG_CONFIG_FOUND ) - pkg_check_modules ( PKGCONFIG_LIBUSB libusb-1.0 ) - if ( NOT PKGCONFIG_LIBUSB_FOUND ) - pkg_check_modules ( PKGCONFIG_LIBUSB libusb ) - endif ( NOT PKGCONFIG_LIBUSB_FOUND ) -endif ( PKG_CONFIG_FOUND ) - -if ( PKGCONFIG_LIBUSB_FOUND ) - set ( LibUSB_INCLUDE_DIRS ${PKGCONFIG_LIBUSB_INCLUDE_DIRS} ) - foreach ( i ${PKGCONFIG_LIBUSB_LIBRARIES} ) - string ( REGEX MATCH "[^-]*" ibase "${i}" ) - find_library ( ${ibase}_LIBRARY - NAMES ${i} - PATHS ${PKGCONFIG_LIBUSB_LIBRARY_DIRS} - ) - if ( ${ibase}_LIBRARY ) - list ( APPEND LibUSB_LIBRARIES ${${ibase}_LIBRARY} ) - endif ( ${ibase}_LIBRARY ) - mark_as_advanced ( ${ibase}_LIBRARY ) - endforeach ( i ) - -else ( PKGCONFIG_LIBUSB_FOUND ) - find_file ( LibUSB_HEADER_FILE - NAMES - libusb.h usb.h - PATHS - $ENV{ProgramFiles}/LibUSB-Win32 - $ENV{LibUSB_ROOT_DIR} - PATH_SUFFIXES - include - libusb-1.0 - include/libusb-1.0 - ) - mark_as_advanced ( LibUSB_HEADER_FILE ) - get_filename_component ( LibUSB_INCLUDE_DIRS "${LibUSB_HEADER_FILE}" PATH ) - - if ( ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" ) - # LibUSB-Win32 binary distribution contains several libs. - # Use the lib that got compiled with the same compiler. - if ( MSVC ) - if ( WIN32 ) - set ( LibUSB_LIBRARY_PATH_SUFFIX lib/msvc ) - else ( WIN32 ) - set ( LibUSB_LIBRARY_PATH_SUFFIX lib/msvc_x64 ) - endif ( WIN32 ) - elseif ( BORLAND ) - set ( LibUSB_LIBRARY_PATH_SUFFIX lib/bcc ) - elseif ( CMAKE_COMPILER_IS_GNUCC ) - set ( LibUSB_LIBRARY_PATH_SUFFIX lib/gcc ) - endif ( MSVC ) - endif ( ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" ) - - find_library ( usb_LIBRARY - NAMES - usb-1.0 libusb usb - PATHS - $ENV{ProgramFiles}/LibUSB-Win32 - $ENV{LibUSB_ROOT_DIR} - PATH_SUFFIXES - ${LibUSB_LIBRARY_PATH_SUFFIX} - ) - mark_as_advanced ( usb_LIBRARY ) - if ( usb_LIBRARY ) - set ( LibUSB_LIBRARIES ${usb_LIBRARY} ) - endif ( usb_LIBRARY ) - -endif ( PKGCONFIG_LIBUSB_FOUND ) - -if ( LibUSB_INCLUDE_DIRS AND LibUSB_LIBRARIES ) - set ( LibUSB_FOUND true ) -endif ( LibUSB_INCLUDE_DIRS AND LibUSB_LIBRARIES ) - -if ( LibUSB_FOUND ) - set ( CMAKE_REQUIRED_INCLUDES "${LibUSB_INCLUDE_DIRS}" ) - check_include_file ( "${LibUSB_HEADER_FILE}" LibUSB_FOUND ) -endif ( LibUSB_FOUND ) - -if ( LibUSB_FOUND ) - check_library_exists ( "${LibUSB_LIBRARIES}" usb_open "" LibUSB_FOUND ) - check_library_exists ( "${LibUSB_LIBRARIES}" libusb_get_device_list "" LibUSB_VERSION_1.0 ) - check_library_exists ( "${LibUSB_LIBRARIES}" libusb_get_port_numbers "" LibUSB_VERSION_1.0.16 ) - - if((STATIC AND UNIX AND NOT APPLE) OR (DEPENDS AND CMAKE_SYSTEM_NAME STREQUAL "Linux")) - find_library(LIBUDEV_LIBRARY udev) - if(LIBUDEV_LIBRARY) - set(LibUSB_LIBRARIES "${LibUSB_LIBRARIES};${LIBUDEV_LIBRARY}") - else() - message(WARNING "libudev library not found, binaries may fail to link.") - endif() - endif() - - # Library 1.0.16+ compilation test. - # The check_library_exists does not work well on Apple with shared libs. - if (APPLE OR LibUSB_VERSION_1.0.16 OR STATIC) - if (APPLE) - if(DEPENDS) - list(APPEND TEST_COMPILE_EXTRA_LIBRARIES "-framework Foundation -framework IOKit") - else() - find_library(COREFOUNDATION CoreFoundation) - find_library(IOKIT IOKit) - list(APPEND TEST_COMPILE_EXTRA_LIBRARIES ${IOKIT}) - list(APPEND TEST_COMPILE_EXTRA_LIBRARIES ${COREFOUNDATION}) - endif() - endif() - if (WIN32) - list(APPEND TEST_COMPILE_EXTRA_LIBRARIES setupapi) - endif() - list(APPEND TEST_COMPILE_EXTRA_LIBRARIES ${LibUSB_LIBRARIES}) - - try_compile(LibUSB_COMPILE_TEST_PASSED - ${CMAKE_BINARY_DIR} - "${CMAKE_SOURCE_DIR}/cmake/test-libusb-version.c" - CMAKE_FLAGS - "-DINCLUDE_DIRECTORIES=${LibUSB_INCLUDE_DIRS}" - "-DLINK_DIRECTORIES=${LibUSB_LIBRARIES}" - LINK_LIBRARIES ${TEST_COMPILE_EXTRA_LIBRARIES} - OUTPUT_VARIABLE OUTPUT) - unset(TEST_COMPILE_EXTRA_LIBRARIES) - message(STATUS "LibUSB Compilation test: ${LibUSB_COMPILE_TEST_PASSED}") - endif() -endif ( LibUSB_FOUND ) - -if ( NOT LibUSB_FOUND ) - if ( NOT LibUSB_FIND_QUIETLY ) - message ( STATUS "LibUSB not found, try setting LibUSB_ROOT_DIR environment variable." ) - endif ( NOT LibUSB_FIND_QUIETLY ) - if ( LibUSB_FIND_REQUIRED ) - message ( FATAL_ERROR "" ) - endif ( LibUSB_FIND_REQUIRED ) -endif ( NOT LibUSB_FOUND ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 23e034f0..8587679d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -115,8 +115,6 @@ target_include_directories(monero-wallet-gui PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/model ${CMAKE_CURRENT_SOURCE_DIR}/QR-Code-scanner ${CMAKE_CURRENT_SOURCE_DIR}/zxcvbn-c - ${LibUSB_INCLUDE_DIRS} - ${HIDAPI_INCLUDE_DIRS} ${X11_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR}