From e0035fd96335fc12dcbd6110df485ff0f532f3ed Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Mon, 17 Jun 2019 22:14:03 +0200 Subject: [PATCH] Created initial CMakeLists.txt --- software/.gitignore | 1 + software/CMakeLists.txt | 3 + software/cmake/Findlibusb-1.0.cmake | 96 +++++++++++++++++++++++++++++ software/drscl/CMakeLists.txt | 33 ++++++++++ software/drscl/Makefile | 2 +- software/include/musbstd.h | 2 +- software/src/musbstd.c | 3 +- 7 files changed, 137 insertions(+), 3 deletions(-) create mode 100644 software/.gitignore create mode 100644 software/CMakeLists.txt create mode 100644 software/cmake/Findlibusb-1.0.cmake create mode 100644 software/drscl/CMakeLists.txt diff --git a/software/.gitignore b/software/.gitignore new file mode 100644 index 0000000..378eac2 --- /dev/null +++ b/software/.gitignore @@ -0,0 +1 @@ +build diff --git a/software/CMakeLists.txt b/software/CMakeLists.txt new file mode 100644 index 0000000..25dec44 --- /dev/null +++ b/software/CMakeLists.txt @@ -0,0 +1,3 @@ +cmake_minimum_required(VERSION 3.0) + +add_subdirectory(drscl) diff --git a/software/cmake/Findlibusb-1.0.cmake b/software/cmake/Findlibusb-1.0.cmake new file mode 100644 index 0000000..4451950 --- /dev/null +++ b/software/cmake/Findlibusb-1.0.cmake @@ -0,0 +1,96 @@ +# - Try to find libusb-1.0 +# Once done this will define +# +# LIBUSB_1_FOUND - system has libusb +# LIBUSB_1_INCLUDE_DIRS - the libusb include directory +# LIBUSB_1_LIBRARIES - Link these to use libusb +# LIBUSB_1_DEFINITIONS - Compiler switches required for using libusb +# +# Adapted from cmake-modules Google Code project +# +# Copyright (c) 2006 Andreas Schneider +# +# (Changes for libusb) Copyright (c) 2008 Kyle Machulis +# +# Redistribution and use is allowed according to the terms of the New BSD license. +# +# CMake-Modules Project New BSD License +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the name of the CMake-Modules Project nor the names of its +# contributors may be used to endorse or promote products derived from this +# software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + + +if (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS) + # in cache already + set(LIBUSB_FOUND TRUE) +else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS) + find_path(LIBUSB_1_INCLUDE_DIR + NAMES +libusb.h + PATHS + /usr/include + /usr/local/include + /sw/include +PATH_SUFFIXES +libusb-1.0 + ) + + find_library(LIBUSB_1_LIBRARY + NAMES + usb-1.0 usb + PATHS + /usr/lib + /usr/local/lib + /sw/lib + ) + + set(LIBUSB_1_INCLUDE_DIRS + ${LIBUSB_1_INCLUDE_DIR} + ) + set(LIBUSB_1_LIBRARIES + ${LIBUSB_1_LIBRARY} +) + + if (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES) + set(LIBUSB_1_FOUND TRUE) + endif (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES) + + if (LIBUSB_1_FOUND) + if (NOT libusb_1_FIND_QUIETLY) + message(STATUS "Found libusb-1.0:") +message(STATUS " - Includes: ${LIBUSB_1_INCLUDE_DIRS}") +message(STATUS " - Libraries: ${LIBUSB_1_LIBRARIES}") + endif (NOT libusb_1_FIND_QUIETLY) + else (LIBUSB_1_FOUND) + if (libusb_1_FIND_REQUIRED) + message(FATAL_ERROR "Could not find libusb") + endif (libusb_1_FIND_REQUIRED) + endif (LIBUSB_1_FOUND) + + # show the LIBUSB_1_INCLUDE_DIRS and LIBUSB_1_LIBRARIES variables only in the advanced view + mark_as_advanced(LIBUSB_1_INCLUDE_DIRS LIBUSB_1_LIBRARIES) + +endif (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS) diff --git a/software/drscl/CMakeLists.txt b/software/drscl/CMakeLists.txt new file mode 100644 index 0000000..73f06cd --- /dev/null +++ b/software/drscl/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.0) + +set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}) +message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") + +include_directories(${CMAKE_SOURCE_DIR}/include) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) +find_package(libusb-1.0 REQUIRED) + +set(SRC + ../src/DRS.cpp + ../src/averager.cpp + ../src/musbstd.c + ../src/mxml.c + ../src/strlcpy.c) + +add_executable(drscl ${SRC} drscl.cpp) +add_executable(drs_exam ${SRC} drs_exam.cpp) +add_executable(drs_exam_multi ${SRC} drs_exam_multi.cpp) + +target_compile_options(drscl PRIVATE -DOS_LINUX -DHAVE_USB -DHAVE_LIBUSB10) +target_include_directories(drscl PRIVATE ${LIBUSB_1_INCLUDE_DIRS}) +target_link_libraries(drscl ${LIBUSB_1_LIBRARIES}) + +target_compile_options(drs_exam PRIVATE -DOS_LINUX -DHAVE_USB -DHAVE_LIBUSB10) +target_include_directories(drs_exam PRIVATE ${LIBUSB_1_INCLUDE_DIRS}) +target_link_libraries(drs_exam ${LIBUSB_1_LIBRARIES}) + +target_compile_options(drs_exam_multi PRIVATE -DOS_LINUX -DHAVE_USB -DHAVE_LIBUSB10) +target_include_directories(drs_exam_multi PRIVATE ${LIBUSB_1_INCLUDE_DIRS}) +target_link_libraries(drs_exam_multi ${LIBUSB_1_LIBRARIES}) + +install(TARGETS drscl drs_exam drs_exam_multi DESTINATION bin) diff --git a/software/drscl/Makefile b/software/drscl/Makefile index 7c51764..2b94c63 100755 --- a/software/drscl/Makefile +++ b/software/drscl/Makefile @@ -8,7 +8,7 @@ OSTYPE = $(shell uname) FLAGS = -g -O3 -Wall -Wuninitialized -Wno-unused-result -DOS_LINUX -FLAGS += -I../include -I/usr/local/include +FLAGS += -I../include -I/usr/local/include -I/usr/local/include/libusb-1.0 LIBS = -lpthread -lutil -lusb-1.0 OBJECTS = DRS.o averager.o musbstd.o mxml.o strlcpy.o diff --git a/software/include/musbstd.h b/software/include/musbstd.h index f4e102e..9265ff5 100644 --- a/software/include/musbstd.h +++ b/software/include/musbstd.h @@ -25,7 +25,7 @@ typedef struct { #elif defined(HAVE_LIBUSB10) -#include +#include typedef struct { libusb_device_handle *dev; diff --git a/software/src/musbstd.c b/software/src/musbstd.c index 20068a8..ec183b9 100755 --- a/software/src/musbstd.c +++ b/software/src/musbstd.c @@ -11,6 +11,7 @@ #include #include +#include #include #ifdef _MSC_VER // Windows includes @@ -63,7 +64,7 @@ DEFINE_GUID(GUID_CLASS_MSCB_BULK, 0xcbeb3fb1, 0xae9f, 0x471c, 0x90, 0x16, 0x9b, #ifdef HAVE_LIBUSB10 #include -#include +#include #endif #if !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUSB10)