| From 46660112b76664473cc98b8ae6c863fd27c27d2d Mon Sep 17 00:00:00 2001 |
| From: Samuel Martin <s.martin49@gmail.com> |
| Date: Fri, 29 Aug 2014 23:40:59 +0200 |
| Subject: [PATCH 1/1] cmake: handle static library and find required thread |
| module |
| |
| Signed-off-by: Samuel Martin <s.martin49@gmail.com> |
| --- |
| CMakeLists.txt | 2 ++ |
| src/CMakeLists.txt | 4 +++- |
| 2 files changed, 5 insertions(+), 1 deletion(-) |
| |
| diff --git a/CMakeLists.txt b/CMakeLists.txt |
| index 79f644c..7779a2a 100644 |
| --- a/CMakeLists.txt |
| +++ b/CMakeLists.txt |
| @@ -6,7 +6,9 @@ enable_testing() |
| # use local module (for Findlibusb-1.0.cmake) |
| set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") |
| |
| +find_package(Threads REQUIRED) |
| find_package(libusb-1.0 REQUIRED) |
| + |
| if (NOT LIBUSB_1_FOUND) |
| message(FATAL_ERROR "libusb-1.0 not installed. (try apt-get install libusb-1.0-0-dev)") |
| endif (NOT LIBUSB_1_FOUND) |
| diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| index 149d198..0597ccd 100644 |
| --- a/src/CMakeLists.txt |
| +++ b/src/CMakeLists.txt |
| @@ -18,8 +18,10 @@ set (iqrf_sources |
| |
| include_directories ("${LIBUSB_1_INCLUDE_DIRS}") |
| |
| -add_library(iqrf SHARED ${iqrf_sources} ${iqrf_headers}) |
| +add_library(iqrf ${iqrf_sources} ${iqrf_headers}) |
| + |
| target_link_libraries(iqrf ${LIBUSB_1_LIBRARIES}) |
| +target_link_libraries(iqrf ${CMAKE_THREAD_LIBS_INIT}) |
| |
| set_target_properties(iqrf PROPERTIES |
| VERSION "${iqrf_version_major}.${iqrf_version_minor}" |
| -- |
| 2.1.0 |
| |
