haraldwolff
/
aasdk
mirror of https://github.com/opencardev/aasdk
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from jcwenger/feature/cmake-warning-fixes 

Feature/cmake warning fixes
develop
Robert Stanley Judka 2020-05-10 20:47:04 -05:00 committed by GitHub
parent b2733fe146 96d2d90c67
commit a4888526da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -1,4 +1,10 @@
# Add any directories, files, or patterns you don't want to be tracked by version control
lib/
bin/
CMakeLists.txt.user
CMakeLists.txt.user
CMakeCache.txt
CMakeFiles
aasdk_proto/*.pb.cc
aasdk_proto/*.pb.h
Makefile
cmake_install.cmake

9
CMakeLists.txt
View File

@ -1,4 +1,10 @@
cmake_minimum_required(VERSION 3.5.1)
find_program(CCACHE_PROGRAM ccache)
if(CCACHE_PROGRAM)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
endif()
project(aasdk CXX)
set(base_directory ${CMAKE_CURRENT_SOURCE_DIR})
@ -44,7 +50,6 @@ set(AASDK_PROTO_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
include_directories(${AASDK_PROTO_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${LIBUSB_1_INCLUDE_DIRS}
${PROTOBUF_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${GTEST_INCLUDE_DIRS}
@ -66,8 +71,8 @@ add_library(aasdk SHARED
add_dependencies(aasdk aasdk_proto)
target_link_libraries(aasdk
aasdk_proto
libusb
${Boost_LIBRARIES}
${LIBUSB_1_LIBRARIES}
${PROTOBUF_LIBRARIES}
${OPENSSL_LIBRARIES}
${WINSOCK2_LIBRARIES})

0
cmake_modules/CodeCoverage.cmake 100755 → 100644
View File

11
cmake_modules/Findlibusb-1.0.cmake
View File

@ -83,13 +83,16 @@ else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
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}")
message(STATUS " - Includes: ${LIBUSB_1_INCLUDE_DIRS}")
message(STATUS " - Libraries: ${LIBUSB_1_LIBRARIES}")
add_library(libusb INTERFACE)
target_include_directories(libusb SYSTEM INTERFACE ${LIBUSB_1_INCLUDE_DIR})
target_link_libraries(libusb INTERFACE ${LIBUSB_1_LIBRARY})
endif (NOT libusb_1_FIND_QUIETLY)
else (LIBUSB_1_FOUND)
if (libusb_1_FIND_REQUIRED)
if (libusb-1.0_FIND_REQUIRED)
message(FATAL_ERROR "Could not find libusb")
endif (libusb_1_FIND_REQUIRED)
endif (libusb-1.0_FIND_REQUIRED)
endif (LIBUSB_1_FOUND)
# show the LIBUSB_1_INCLUDE_DIRS and LIBUSB_1_LIBRARIES variables only in the advanced view