1*4882a593SmuzhiyunFrom 46660112b76664473cc98b8ae6c863fd27c27d2d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Samuel Martin <s.martin49@gmail.com> 3*4882a593SmuzhiyunDate: Fri, 29 Aug 2014 23:40:59 +0200 4*4882a593SmuzhiyunSubject: [PATCH 1/1] cmake: handle static library and find required thread 5*4882a593Smuzhiyun module 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunSigned-off-by: Samuel Martin <s.martin49@gmail.com> 8*4882a593Smuzhiyun--- 9*4882a593Smuzhiyun CMakeLists.txt | 2 ++ 10*4882a593Smuzhiyun src/CMakeLists.txt | 4 +++- 11*4882a593Smuzhiyun 2 files changed, 5 insertions(+), 1 deletion(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/CMakeLists.txt b/CMakeLists.txt 14*4882a593Smuzhiyunindex 79f644c..7779a2a 100644 15*4882a593Smuzhiyun--- a/CMakeLists.txt 16*4882a593Smuzhiyun+++ b/CMakeLists.txt 17*4882a593Smuzhiyun@@ -6,7 +6,9 @@ enable_testing() 18*4882a593Smuzhiyun # use local module (for Findlibusb-1.0.cmake) 19*4882a593Smuzhiyun set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") 20*4882a593Smuzhiyun 21*4882a593Smuzhiyun+find_package(Threads REQUIRED) 22*4882a593Smuzhiyun find_package(libusb-1.0 REQUIRED) 23*4882a593Smuzhiyun+ 24*4882a593Smuzhiyun if (NOT LIBUSB_1_FOUND) 25*4882a593Smuzhiyun message(FATAL_ERROR "libusb-1.0 not installed. (try apt-get install libusb-1.0-0-dev)") 26*4882a593Smuzhiyun endif (NOT LIBUSB_1_FOUND) 27*4882a593Smuzhiyundiff --git a/src/CMakeLists.txt b/src/CMakeLists.txt 28*4882a593Smuzhiyunindex 149d198..0597ccd 100644 29*4882a593Smuzhiyun--- a/src/CMakeLists.txt 30*4882a593Smuzhiyun+++ b/src/CMakeLists.txt 31*4882a593Smuzhiyun@@ -18,8 +18,10 @@ set (iqrf_sources 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun include_directories ("${LIBUSB_1_INCLUDE_DIRS}") 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun-add_library(iqrf SHARED ${iqrf_sources} ${iqrf_headers}) 36*4882a593Smuzhiyun+add_library(iqrf ${iqrf_sources} ${iqrf_headers}) 37*4882a593Smuzhiyun+ 38*4882a593Smuzhiyun target_link_libraries(iqrf ${LIBUSB_1_LIBRARIES}) 39*4882a593Smuzhiyun+target_link_libraries(iqrf ${CMAKE_THREAD_LIBS_INIT}) 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun set_target_properties(iqrf PROPERTIES 42*4882a593Smuzhiyun VERSION "${iqrf_version_major}.${iqrf_version_minor}" 43*4882a593Smuzhiyun-- 44*4882a593Smuzhiyun2.1.0 45*4882a593Smuzhiyun 46