X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=d2697fae7c2c6d21a670166a39666283f49a933b;hp=f4325bf7dcfdb16928a53a1fc62559e3e3342fda;hb=b8f1cdeba7cf6c2b749ff60102ce4e260fa1309e;hpb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416 diff --git a/CMakeLists.txt b/CMakeLists.txt index f4325bf..d2697fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,14 +42,6 @@ if(WIN32) # This option is user configurable, but enable it by default on win32. set(STATIC_PKGDEPS_LIBS TRUE) - # For boost-thread we need two additional settings on win32: - set(Boost_USE_STATIC_LIBS ON) - add_definitions(-DBOOST_THREAD_USE_LIB) - - # On Windows/MinGW we need to use 'thread_win32' instead of 'thread'. - # The library is named libboost_thread_win32* (not libboost_thread*). - set(Boost_THREADAPI win32) - # Windows does not support UNIX signals. set(ENABLE_SIGNALS FALSE) endif() @@ -102,7 +94,7 @@ else() find_package(Qt4 REQUIRED QtCore QtGui QtSvg) endif() -set(BOOSTCOMPS filesystem serialization system thread) +set(BOOSTCOMPS filesystem serialization system) if(ENABLE_TESTS) list(APPEND BOOSTCOMPS unit_test_framework) endif()