diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2015-02-17 20:14:34 +0100 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-02-17 23:30:04 +0100 |
| commit | 254be95ff2f37df8adec7ce068448ba8abc8d734 (patch) | |
| tree | f1483c2ff4c2e194cf90c59ce741d96917f7aaf5 /CMakeLists.txt | |
| parent | 0d0543e4daeb1c6b01d4799736026b6f3aef9779 (diff) | |
| parent | 0d0749ff0f842f10fea6929dc466e4e1be458234 (diff) | |
| download | ble-toys-254be95ff2f37df8adec7ce068448ba8abc8d734.tar.gz ble-toys-254be95ff2f37df8adec7ce068448ba8abc8d734.tar.bz2 ble-toys-254be95ff2f37df8adec7ce068448ba8abc8d734.tar.xz ble-toys-254be95ff2f37df8adec7ce068448ba8abc8d734.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Bluetooth.cpp
Bluetooth.h
ByteBuffer.cpp
CMakeLists.txt
LinuxBluetooth.cpp
main.cpp
test/ByteBufferTest.cpp
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1098415..5c596e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8.4) project(ble_toys) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_MULTITHREADED OFF) @@ -26,7 +26,7 @@ target_link_libraries(ble_toys ${Boost_LIBRARIES}) target_link_libraries(ble_toys ble) enable_testing() -find_package(Boost COMPONENTS unit_test_framework REQUIRED) +find_package(Boost COMPONENTS log unit_test_framework REQUIRED) # If we can change directory here add_definition and test-specific stuff could be moved to the test directory file(GLOB TEST_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test/*.cpp) @@ -42,8 +42,9 @@ foreach(testSrc ${TEST_SRCS}) include_directories(${PROJECT_SOURCE_DIR}) #link to Boost libraries AND your targets and dependencies - target_link_libraries(${testName} ${Boost_LIBRARIES}) target_link_libraries(${testName} ble) + target_link_libraries(${testName} pthread) + target_link_libraries(${testName} ${Boost_LIBRARIES}) #I like to move testing binaries into a testBin directory set_target_properties(${testName} PROPERTIES |