Skip to content

Enable use of unbundled libusb #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bkmgit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable use of unbundled libusb #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ find_package(Qt5 COMPONENTS Core Widgets Svg REQUIRED)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)

add_subdirectory(libusb)

set(src_files
"main.cpp"
"MainWindow.cpp"
Expand Down Expand Up @@ -67,13 +65,26 @@ add_executable(Robocut MACOSX_BUNDLE WIN32
${src_files}
)

target_link_libraries(Robocut
Qt5::Widgets
Qt5::Svg
libusb
)

target_compile_definitions(Robocut PRIVATE "-DROBOCUT_VERSION=\"${PROJECT_VERSION}\"")
find_package(PkgConfig)
pkg_check_modules(LIBUSB IMPORTED_TARGET libusb-1.0)
if (${LIBUSB_FOUND})
target_include_directories(${CMAKE_PROJECT_NAME}
PUBLIC ${LIBUSB_INCLUDE_DIRS})
target_link_libraries(${CMAKE_PROJECT_NAME}
Qt5::Widgets
Qt5::Svg
PkgConfig::LIBUSB)
else (${LIBUSB_FOUND})
add_subdirectory(libusb)
target_include_directories(${CMAKE_PROJECT_NAME}
PUBLIC "libusb/libusb")
target_link_libraries(${CMAKE_PROJECT_NAME}
Qt5::Widgets
Qt5::Svg
libusb)
endif (${LIBUSB_FOUND})

target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE "-DROBOCUT_VERSION=\"${PROJECT_VERSION}\"")

# Packaging
if (WIN32)
Expand All @@ -90,7 +101,7 @@ if (WIN32)
"--no-angle" "--no-opengl-sw" "--no-translations" "--no-system-d3d-compiler"
"${CMAKE_BINARY_DIR}/Zip/Robocut/Robocut.exe"

DEPENDS Robocut
DEPENDS ${CMAKE_PROJECT_NAME}
COMMENT "Deploying Qt"
VERBATIM
)
Expand All @@ -111,20 +122,20 @@ elseif (APPLE)
COMMAND "${_qt5Core_install_prefix}/bin/macdeployqt" "Robocut.app" "-dmg"
COMMAND "${CMAKE_COMMAND}" "-E" "rename" "${CMAKE_BINARY_DIR}/Robocut.dmg"
"${CMAKE_BINARY_DIR}/Robocut-${PROJECT_VERSION}.dmg"
DEPENDS Robocut
DEPENDS ${CMAKE_PROJECT_NAME}
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
COMMENT "Creating DMG"
VERBATIM
)
else ()
# This is just here for consistency with platforms that don't produce zip or dmg.
add_custom_Target(artefact
DEPENDS Robocut
DEPENDS ${CMAKE_PROJECT_NAME}
COMMENT "Not generating build artefact"
VERBATIM
)

install(TARGETS Robocut
install(TARGETS ${CMAKE_PROJECT_NAME}
RUNTIME DESTINATION bin)

endif ()
2 changes: 1 addition & 1 deletion Plotter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "Plotter.h"
#include "ProgramOptions.h"

#include <libusb/libusb.h>
#include <libusb.h>

int VENDOR_ID = ProgramOptions::Instance().getVendorUSB_ID();
int PRODUCT_ID = ProgramOptions::Instance().getProductUSB_ID();
Expand Down
2 changes: 1 addition & 1 deletion main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include "ProgramOptions.h"

#include <libusb/libusb.h>
#include <libusb.h>
#include <iostream>

using namespace std;
Expand Down