X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=07c2d4b98531299433ac1b9497c082b7b91e5b8b;hp=c17e77f46ed81f7c45d6812bccdf2f554bd886ec;hb=951c583c1928fb0aeaea4b980114bcf74c362c42;hpb=b3f22de060b73f15ad3eb2dabee04a0b4f5d947e

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c17e77f4..07c2d4b9 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>
 ##
@@ -30,7 +30,7 @@ pkg_check_modules(PKGDEPS REQUIRED
 
 # On Windows/MinGW we explicitly point cmake to the Boost directory.
 if(WIN32)
-set(BOOST_ROOT /usr/local)
+	set(BOOST_ROOT /usr/local)
 endif(WIN32)
 
 find_package(Qt4 REQUIRED)
@@ -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})
@@ -93,30 +93,32 @@ add_definitions(-DAPP_VERSION="${VERSION}")
 
 # On Windows/MinGW we need PKGDEPS_STATIC_INCLUDE_DIRS.
 if(WIN32)
-include_directories(
-	${include_directories}
-	${Boost_INCLUDE_DIRS}
-	${PKGDEPS_STATIC_INCLUDE_DIRS}
-)
+	include_directories(
+		${include_directories}
+		${CMAKE_CURRENT_BINARY_DIR}
+		${Boost_INCLUDE_DIRS}
+		${PKGDEPS_STATIC_INCLUDE_DIRS}
+	)
 else(WIN32)
-include_directories(
-	${include_directories}
-	${Boost_INCLUDE_DIRS}
-	${PKGDEPS_INCLUDE_DIRS}
-)
+	include_directories(
+		${include_directories}
+		${CMAKE_CURRENT_BINARY_DIR}
+		${Boost_INCLUDE_DIRS}
+		${PKGDEPS_INCLUDE_DIRS}
+	)
 endif(WIN32)
 
 # On Windows/MinGW we need PKGDEPS_STATIC_LIBRARY_DIRS.
 if(WIN32)
-link_directories(
-	${Boost_LIBRARY_DIRS}
-	${PKGDEPS_STATIC_LIBRARY_DIRS}
-)
+	link_directories(
+		${Boost_LIBRARY_DIRS}
+		${PKGDEPS_STATIC_LIBRARY_DIRS}
+	)
 else(WIN32)
-link_directories(
-	${Boost_LIBRARY_DIRS}
-	${PKGDEPS_LIBRARY_DIRS}
-)
+	link_directories(
+		${Boost_LIBRARY_DIRS}
+		${PKGDEPS_LIBRARY_DIRS}
+	)
 endif(WIN32)
 
 add_executable(pulseview
@@ -128,45 +130,45 @@ add_executable(pulseview
 
 # On Windows/MinGW we need PKGDEPS_STATIC_LIBRARIES.
 if(WIN32)
-target_link_libraries(pulseview
-	${Boost_LIBRARIES}
-	${PKGDEPS_STATIC_LIBRARIES}
-	${QT_LIBRARIES}
-)
+	target_link_libraries(pulseview
+		${Boost_LIBRARIES}
+		${PKGDEPS_STATIC_LIBRARIES}
+		${QT_LIBRARIES}
+	)
 else(WIN32)
-target_link_libraries(pulseview
-	${Boost_LIBRARIES}
-	${PKGDEPS_LIBRARIES}
-	${QT_LIBRARIES}
-)
+	target_link_libraries(pulseview
+		${Boost_LIBRARIES}
+		${PKGDEPS_LIBRARIES}
+		${QT_LIBRARIES}
+	)
 endif(WIN32)
 
-if(ENABLE_TESTS)
-
-add_definitions(-DBOOST_TEST_DYN_LINK)
-
-add_executable(pulseview-test
-	${pulseview_TEST_SOURCES}
-)
-
-# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARIES.
-if(WIN32)
-target_link_libraries(pulseview-test
-	${Boost_LIBRARIES}
-	${PKGDEPS_STATIC_LIBRARIES}
-	${QT_LIBRARIES}
-)
-else(WIN32)
-target_link_libraries(pulseview-test
-	${Boost_LIBRARIES}
-	${PKGDEPS_LIBRARIES}
-	${QT_LIBRARIES}
-)
-endif(WIN32)
+install(PROGRAMS pulseview DESTINATION bin/)
 
-enable_testing()
-add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)
+if(ENABLE_TESTS)
 
-install(PROGRAMS pulseview DESTINATION bin/)
+	add_definitions(-DBOOST_TEST_DYN_LINK)
+
+	add_executable(pulseview-test
+		${pulseview_TEST_SOURCES}
+	)
+
+	# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARIES.
+	if(WIN32)
+		target_link_libraries(pulseview-test
+			${Boost_LIBRARIES}
+			${PKGDEPS_STATIC_LIBRARIES}
+			${QT_LIBRARIES}
+		)
+	else(WIN32)
+		target_link_libraries(pulseview-test
+			${Boost_LIBRARIES}
+			${PKGDEPS_LIBRARIES}
+			${QT_LIBRARIES}
+		)
+	endif(WIN32)
+
+	enable_testing()
+	add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)
 
 endif(ENABLE_TESTS)