mirror of
https://git.wownero.com/wownero/onion-wownero-blockchain-explorer.git
synced 2024-08-15 00:33:12 +00:00
Merge branch 'devel'
This commit is contained in:
commit
e2a7325331
3 changed files with 66 additions and 3 deletions
|
@ -126,9 +126,9 @@ set(LIBRARIES
|
||||||
ssl)
|
ssl)
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
set(LIBRARIES ${LIBRARIES} "-framework IOKit -framework PCSC")
|
set(LIBRARIES ${LIBRARIES} "-framework IOKit -framework Foundation")
|
||||||
else()
|
else()
|
||||||
set(LIBRARIES ${LIBRARIES} atomic pcsclite)
|
set(LIBRARIES ${LIBRARIES} atomic)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT WIN32)
|
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT WIN32)
|
||||||
|
@ -146,4 +146,7 @@ else()
|
||||||
set(LIBRARIES ${LIBRARIES} dl)
|
set(LIBRARIES ${LIBRARIES} dl)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
find_package(HIDAPI)
|
||||||
|
set(LIBRARIES ${LIBRARIES} ${HIDAPI_LIBRARIES})
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME} ${LIBRARIES})
|
target_link_libraries(${PROJECT_NAME} ${LIBRARIES})
|
||||||
|
|
|
@ -98,7 +98,7 @@ Download and compile recent Monero into your home folder:
|
||||||
# first install monero dependecines
|
# first install monero dependecines
|
||||||
sudo apt update
|
sudo apt update
|
||||||
|
|
||||||
sudo apt install git build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libcurl4-openssl-dev libgtest-dev libreadline-dev libzmq3-dev libsodium-dev libpcsclite-dev
|
sudo apt install git build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libcurl4-openssl-dev libgtest-dev libreadline-dev libzmq3-dev libsodium-dev libhidapi-dev libhidapi-libusb0
|
||||||
|
|
||||||
# go to home folder
|
# go to home folder
|
||||||
cd ~
|
cd ~
|
||||||
|
|
60
cmake/FindHIDAPI.cmake
Normal file
60
cmake/FindHIDAPI.cmake
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
# - 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}")
|
||||||
|
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)
|
Loading…
Reference in a new issue