X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=e383d7138c2fb3ef5852fc19f5713978d886a484;hb=74043039e3ccc19fe890355722b14f2f5272f19c;hp=363470bba5761cc30a4db25e5617af924ebbbd35;hpb=fb746bcc3d2b317e7ced838ff0f90cdf3dfe7aed;p=pulseview.git

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 363470bb..e383d713 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,15 +18,32 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
+# Find the platform's thread library (needed for boost-thread).
+# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
+find_package(Threads)
+
+find_package(Boost 1.46 COMPONENTS system unit_test_framework REQUIRED)
+
 set(pulseview_TEST_SOURCES
-	${PROJECT_SOURCE_DIR}/pv/datasnapshot.cpp
-	${PROJECT_SOURCE_DIR}/pv/logicdatasnapshot.cpp
-	logicdatasnapshot.cpp
+	${PROJECT_SOURCE_DIR}/pv/data/analogsnapshot.cpp
+	${PROJECT_SOURCE_DIR}/pv/data/snapshot.cpp
+	${PROJECT_SOURCE_DIR}/pv/data/logicsnapshot.cpp
+	data/analogsnapshot.cpp
+	data/logicsnapshot.cpp
 	test.cpp
 )
 
 add_definitions(-DBOOST_TEST_DYN_LINK)
 
+include_directories(
+	${Boost_INCLUDE_DIRS}
+)
+
+set(PULSEVIEW_LINK_LIBS
+	${Boost_LIBRARIES}
+	${CMAKE_THREAD_LIBS_INIT}
+)
+
 add_executable(pulseview-test
 	${pulseview_TEST_SOURCES}
 )