#= User Options
#-------------------------------------------------------------------------------
+option(DISABLE_WERROR "Build without -Werror" FALSE)
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()
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)
+if(WIN32)
+# On Windows/MinGW the we need to use 'thread_win32' instead of 'thread'.
+# The library is named libboost_thread_win32* (not libboost_thread*).
+find_package(Boost 1.46 COMPONENTS system thread_win32)
+else()
+find_package(Boost 1.46 COMPONENTS system thread)
+endif()
#===============================================================================
#= Config Header
#-------------------------------------------------------------------------------
set(PV_TITLE PulseView)
+set(PV_DESCRIPTION "A GUI for sigrok")
set(PV_VERSION_MAJOR 0)
set(PV_VERSION_MINOR 1)
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})
#-------------------------------------------------------------------------------
add_definitions(${QT_DEFINITIONS})
+add_definitions(-Wextra)
+
+if(NOT DISABLE_WERROR)
+ add_definitions(-Werror)
+endif()
#===============================================================================
#= Global Include Directories
list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
endif()
-add_executable(pulseview
+add_executable(${PROJECT_NAME}
${pulseview_SOURCES}
${pulseview_HEADERS_MOC}
${pulseview_FORMS_HEADERS}
${pulseview_RESOURCES_RCC}
)
-target_link_libraries(pulseview ${PULSEVIEW_LINK_LIBS})
+target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
#===============================================================================
#= Installation
#-------------------------------------------------------------------------------
-install(PROGRAMS pulseview DESTINATION bin/)
+install(PROGRAMS ${PROJECT_NAME} DESTINATION bin/)
#===============================================================================
#= Tests
#-------------------------------------------------------------------------------
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)