X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=41e623186e42e1f085f019a34c05a4be16ecc611;hb=bc1c1462b366a327e2abfc3c0169ab2f657533a5;hp=79f4e40ad1764a57378a04b54cfd633607de3eca;hpb=68c4a3b3562ea90a2afbbffea4e903194fdc38bc;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79f4e40a..41e62318 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 ##
-## This file is part of pulseview
+## This file is part of the PulseView project.
 ##
 ## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
 ##
@@ -39,17 +39,17 @@ find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
 set(VERSION 0.1.0)
 
 set(pulseview_SOURCES
-	about.cpp
-	datasnapshot.cpp
-	logicdata.cpp
-	logicdatasnapshot.cpp
-	logicsignal.cpp
 	main.cpp
-	mainwindow.cpp
-	samplingbar.cpp
-	signaldata.cpp
-	sigsession.cpp
-	signal.cpp
+	pv/about.cpp
+	pv/datasnapshot.cpp
+	pv/logicdata.cpp
+	pv/logicdatasnapshot.cpp
+	pv/logicsignal.cpp
+	pv/mainwindow.cpp
+	pv/samplingbar.cpp
+	pv/signaldata.cpp
+	pv/sigsession.cpp
+	pv/signal.cpp
 	pv/view/header.cpp
 	pv/view/ruler.cpp
 	pv/view/view.cpp
@@ -57,10 +57,10 @@ set(pulseview_SOURCES
 )
 
 set(pulseview_HEADERS
-	about.h
-	mainwindow.h
-	samplingbar.h
-	sigsession.h
+	pv/about.h
+	pv/mainwindow.h
+	pv/samplingbar.h
+	pv/sigsession.h
 	pv/view/header.h
 	pv/view/ruler.h
 	pv/view/view.h
@@ -68,7 +68,7 @@ set(pulseview_HEADERS
 )
 
 set(pulseview_FORMS
-	about.ui
+	pv/about.ui
 )
 
 set(pulseview_RESOURCES
@@ -76,10 +76,10 @@ set(pulseview_RESOURCES
 )
 
 set(pulseview_TEST_SOURCES
+	pv/datasnapshot.cpp
+	pv/logicdatasnapshot.cpp
 	test/logicdatasnapshot.cpp
 	test/test.cpp
-	datasnapshot.cpp
-	logicdatasnapshot.cpp
 )
 
 qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
@@ -95,12 +95,14 @@ add_definitions(-DAPP_VERSION="${VERSION}")
 if(WIN32)
 include_directories(
 	${include_directories}
+	${CMAKE_CURRENT_BINARY_DIR}
 	${Boost_INCLUDE_DIRS}
 	${PKGDEPS_STATIC_INCLUDE_DIRS}
 )
 else(WIN32)
 include_directories(
 	${include_directories}
+	${CMAKE_CURRENT_BINARY_DIR}
 	${Boost_INCLUDE_DIRS}
 	${PKGDEPS_INCLUDE_DIRS}
 )
@@ -141,6 +143,8 @@ target_link_libraries(pulseview
 )
 endif(WIN32)
 
+install(PROGRAMS pulseview DESTINATION bin/)
+
 if(ENABLE_TESTS)
 
 add_definitions(-DBOOST_TEST_DYN_LINK)
@@ -167,6 +171,4 @@ endif(WIN32)
 enable_testing()
 add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)
 
-install(PROGRAMS pulseview DESTINATION bin/)
-
 endif(ENABLE_TESTS)