X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=a28f4f37f3a0bc107ac75b502ab71490d2112166;hb=a838ed7b0112b59a4a5fde684605f3e2b2797e37;hp=69e62ee5e4dd3bed6757c1e20a1a3756ab66c377;hpb=3a21afa6a5dfc06c17f127960bb0038fd322f213;p=pulseview.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 69e62ee..a28f4f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,11 +97,11 @@ else() find_package(Qt4 REQUIRED QtCore QtGui QtSvg) endif() +set(BOOSTCOMPS filesystem serialization system thread) if(ENABLE_TESTS) - find_package(Boost 1.53 COMPONENTS filesystem serialization system thread unit_test_framework REQUIRED) -else() - find_package(Boost 1.53 COMPONENTS filesystem serialization system thread REQUIRED) + list(APPEND BOOSTCOMPS unit_test_framework) endif() +find_package(Boost 1.55 COMPONENTS ${BOOSTCOMPS} REQUIRED) # Find the platform's thread library (needed for C++11 threads). # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value. @@ -396,6 +396,7 @@ add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS) add_definitions(-D__STDC_LIMIT_MACROS) add_definitions(-Wall -Wextra) add_definitions(-std=c++11) +add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1) if(ENABLE_DECODE) add_definitions(-DENABLE_DECODE)