Made TimeMarker and Cursor QObjects

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60d7bfacfb37000059e9e2602611c449b5275fbe..1513d6dd1f14da578c66561859142628b6ed85ce 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()
 
@@ -49,12 +49,30 @@ pkg_check_modules(PKGDEPS 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)
 
-set(VERSION 0.1.0)
+find_package(Boost 1.46)
+
+#===============================================================================
+#= Config Header
+#-------------------------------------------------------------------------------
+
+set(PV_TITLE PulseView)
+set(PV_DESCRIPTION "A GUI for sigrok")
+
+set(PV_VERSION_MAJOR 0)
+set(PV_VERSION_MINOR 1)
+set(PV_VERSION_MICRO 0)
+set(PV_VERSION_STRING
+       ${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}
+)
+
+configure_file (
+       ${PROJECT_SOURCE_DIR}/config.h.in
+       ${PROJECT_BINARY_DIR}/config.h
+)
 
 #===============================================================================
 #= Sources
@@ -72,8 +90,10 @@ set(pulseview_SOURCES
        pv/signaldata.cpp
        pv/sigsession.cpp
        pv/signal.cpp
+       pv/view/cursor.cpp
        pv/view/header.cpp
        pv/view/ruler.cpp
+       pv/view/timemarker.cpp
        pv/view/view.cpp
        pv/view/viewport.cpp
 )
@@ -83,8 +103,10 @@ set(pulseview_HEADERS
        pv/mainwindow.h
        pv/samplingbar.h
        pv/sigsession.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
 )
@@ -97,13 +119,6 @@ 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})
@@ -115,7 +130,7 @@ include(${QT_USE_FILE})
 #-------------------------------------------------------------------------------
 
 add_definitions(${QT_DEFINITIONS})
-add_definitions(-DAPP_VERSION="${VERSION}")
+add_definitions(-Werror -Wall)
 
 #===============================================================================
 #= Global Include Directories
@@ -123,6 +138,7 @@ add_definitions(-DAPP_VERSION="${VERSION}")
 
 include_directories(
        ${CMAKE_CURRENT_BINARY_DIR}
+       ${CMAKE_CURRENT_SOURCE_DIR}
        ${Boost_INCLUDE_DIRS}
 )
 
@@ -151,36 +167,27 @@ else()
        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(-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)