X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=a66a95bd871e9ecb3e06e495ce0e16826e1fefbd;hp=49358505fe81dd4891a0fc0c4777cb8b9ca89201;hb=e6fd809f20855828c4f393a0e0659d65818d79c7;hpb=7591fe238e1be53579819ec97bc0b3b76af8f67e

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49358505..a66a95bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
 option(DISABLE_WERROR "Build without -Werror" FALSE)
 option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
 option(ENABLE_DECODE "Build with libsigrokdecode" TRUE)
-option(ENABLE_COTIRE "Enable cotire" FALSE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
 option(FORCE_QT4 "Force use of Qt4 even if Qt5 is available" FALSE)
@@ -48,6 +47,10 @@ if(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()
@@ -95,10 +98,8 @@ else()
 	find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 endif()
 
-if(WIN32)
-	# On Windows/MinGW we need to use 'thread_win32' instead of 'thread'.
-	# The library is named libboost_thread_win32* (not libboost_thread*).
-	find_package(Boost 1.42 COMPONENTS filesystem system thread_win32 REQUIRED)
+if(ENABLE_TESTS)
+	find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
 else()
 	find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED)
 endif()
@@ -142,7 +143,7 @@ set(pulseview_SOURCES
 	pv/application.cpp
 	pv/devicemanager.cpp
 	pv/mainwindow.cpp
-	pv/sigsession.cpp
+	pv/session.cpp
 	pv/storesession.cpp
 	pv/util.cpp
 	pv/data/analog.cpp
@@ -194,7 +195,7 @@ set(pulseview_SOURCES
 # This list includes only QObject derived class headers.
 set(pulseview_HEADERS
 	pv/mainwindow.hpp
-	pv/sigsession.hpp
+	pv/session.hpp
 	pv/storesession.hpp
 	pv/dialogs/about.hpp
 	pv/dialogs/connect.hpp
@@ -385,11 +386,6 @@ if(WIN32)
 	set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
 endif()
 
-if(ENABLE_COTIRE)
-	include(cotire)
-	cotire(${PROJECT_NAME})
-endif()
-
 #===============================================================================
 #= Installation
 #-------------------------------------------------------------------------------