Supressed unused parameters

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1f122c416fb52116864329cfe97f218e5677259..1e1716b7f512cacbf6ddd3a2199d80fef3ca5d72 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,11 +28,11 @@ project(pulseview)
 #-------------------------------------------------------------------------------
 
 option(ENABLE_TESTS "Enable unit tests" FALSE)
-option(STATIC_PKGDEPS_LIBS "Statically link to sigrok libraries" FALSE)
+option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
 
 if(WIN32)
-       # On Windows/MinGW we need to statically link to libraries
-       # This option is user configurable, but enable it by default on win32
+       # On Windows/MinGW we need to statically link to libraries.
+       # This option is user configurable, but enable it by default on win32.
        set(STATIC_PKGDEPS_LIBS TRUE)
 endif()
 
@@ -46,19 +46,21 @@ pkg_check_modules(PKGDEPS REQUIRED
        libsigrok>=0.2.0
 )
 
+find_package(Qt4 REQUIRED)
+
 # On Windows/MinGW we explicitly point cmake to the Boost directory.
 if(WIN32)
        set(BOOST_ROOT /usr/local)
-endif(WIN32)
+endif()
 
-find_package(Qt4 REQUIRED)
-find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
+find_package(Boost 1.46 COMPONENTS system thread)
 
 #===============================================================================
 #= Config Header
 #-------------------------------------------------------------------------------
 
 set(PV_TITLE PulseView)
+set(PV_DESCRIPTION "A GUI for sigrok")
 
 set(PV_VERSION_MAJOR 0)
 set(PV_VERSION_MINOR 1)
@@ -78,48 +80,53 @@ configure_file (
 
 set(pulseview_SOURCES
        main.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/data/analog.cpp
+       pv/data/analogsnapshot.cpp
+       pv/data/logic.cpp
+       pv/data/logicsnapshot.cpp
+       pv/data/signaldata.cpp
+       pv/data/snapshot.cpp
+       pv/dialogs/about.cpp
+       pv/dialogs/hwcap.cpp
+       pv/prop/enum.cpp
+       pv/prop/property.cpp
+       pv/prop/binding/binding.cpp
+       pv/prop/binding/hwcap.cpp
+       pv/view/analogsignal.cpp
+       pv/view/cursor.cpp
        pv/view/header.cpp
+       pv/view/logicsignal.cpp
        pv/view/ruler.cpp
+       pv/view/signal.cpp
+       pv/view/timemarker.cpp
        pv/view/view.cpp
        pv/view/viewport.cpp
 )
 
 set(pulseview_HEADERS
-       pv/about.h
        pv/mainwindow.h
        pv/samplingbar.h
        pv/sigsession.h
+       pv/dialogs/about.h
+       pv/view/cursor.h
        pv/view/header.h
        pv/view/ruler.h
+       pv/view/timemarker.h
        pv/view/view.h
        pv/view/viewport.h
 )
 
 set(pulseview_FORMS
-       pv/about.ui
+       pv/dialogs/about.ui
 )
 
 set(pulseview_RESOURCES
        pulseview.qrc
 )
 
-set(pulseview_TEST_SOURCES
-       pv/datasnapshot.cpp
-       pv/logicdatasnapshot.cpp
-       test/logicdatasnapshot.cpp
-       test/test.cpp
-)
-
 qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
 qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
 qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
@@ -131,6 +138,7 @@ include(${QT_USE_FILE})
 #-------------------------------------------------------------------------------
 
 add_definitions(${QT_DEFINITIONS})
+add_definitions(-Werror -Wall)
 
 #===============================================================================
 #= Global Include Directories
@@ -187,18 +195,7 @@ install(PROGRAMS ${PROJECT_NAME} DESTINATION bin/)
 #-------------------------------------------------------------------------------
 
 if(ENABLE_TESTS)
-
-       add_definitions(pulseview-tests
-               -DBOOST_TEST_DYN_LINK
-       )
-
-       add_executable(pulseview-test
-               ${pulseview_TEST_SOURCES}
-       )
-
-       target_link_libraries(pulseview-test ${PULSEVIEW_LINK_LIBS})
-
+       add_subdirectory(test)
        enable_testing()
-       add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)
-
+       add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/pulseview-test)
 endif(ENABLE_TESTS)