Build system: Fix issue with unit tests, simplify code.
[pulseview.git] / test / CMakeLists.txt
index de2ef909cf86fdf7af5d07ebc1acd337a42b2b20..22612b91d05e59378fd96df74238f4759194a24a 100644 (file)
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-option(ENABLE_DECODE "Build with libsigrokdecode" FALSE)
-
-list(APPEND PKGDEPS libsigrok>=0.2.0)
-
-if(ENABLE_DECODE)
-       list(APPEND PKGDEPS libsigrokdecode>=0.2.0)
-endif()
-
-find_package(PkgConfig)
-pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
-
-# Find the platform's thread library (needed for boost-thread).
-# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
-find_package(Threads)
-
-find_package(Boost 1.42 COMPONENTS system thread unit_test_framework REQUIRED)
-
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
-find_package(Qt4 REQUIRED)
-
 set(pulseview_TEST_SOURCES
        ${PROJECT_SOURCE_DIR}/pv/devicemanager.cpp
        ${PROJECT_SOURCE_DIR}/pv/sigsession.cpp
+       ${PROJECT_SOURCE_DIR}/pv/util.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/analog.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/analogsnapshot.cpp
@@ -48,12 +29,15 @@ set(pulseview_TEST_SOURCES
        ${PROJECT_SOURCE_DIR}/pv/data/logicsnapshot.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/snapshot.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/signaldata.cpp
+       ${PROJECT_SOURCE_DIR}/pv/prop/double.cpp
+       ${PROJECT_SOURCE_DIR}/pv/prop/enum.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/int.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/property.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/string.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/binding/binding.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/analogsignal.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/cursor.cpp
+       ${PROJECT_SOURCE_DIR}/pv/view/cursorheader.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/header.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp
@@ -75,34 +59,40 @@ set(pulseview_TEST_SOURCES
        test.cpp
 )
 
-# This list includes only QObject derrived class headers
+# This list includes only QObject derived class headers.
 set(pulseview_TEST_HEADERS
-       ${PROJECT_SOURCE_DIR}/pv/sigsession.h
-       ${PROJECT_SOURCE_DIR}/pv/prop/int.h
-       ${PROJECT_SOURCE_DIR}/pv/prop/property.h
-       ${PROJECT_SOURCE_DIR}/pv/prop/string.h
-       ${PROJECT_SOURCE_DIR}/pv/view/cursor.h
-       ${PROJECT_SOURCE_DIR}/pv/view/header.h
-       ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.h
-       ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.h
-       ${PROJECT_SOURCE_DIR}/pv/view/ruler.h
-       ${PROJECT_SOURCE_DIR}/pv/view/selectableitem.h
-       ${PROJECT_SOURCE_DIR}/pv/view/signal.h
-       ${PROJECT_SOURCE_DIR}/pv/view/timemarker.h
-       ${PROJECT_SOURCE_DIR}/pv/view/trace.h
-       ${PROJECT_SOURCE_DIR}/pv/view/view.h
-       ${PROJECT_SOURCE_DIR}/pv/view/viewport.h
-       ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.h
-       ${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.h
-       ${PROJECT_SOURCE_DIR}/pv/widgets/popup.h
-       ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.h
+       ${PROJECT_SOURCE_DIR}/pv/sigsession.hpp
+       ${PROJECT_SOURCE_DIR}/pv/prop/double.hpp
+       ${PROJECT_SOURCE_DIR}/pv/prop/enum.hpp
+       ${PROJECT_SOURCE_DIR}/pv/prop/int.hpp
+       ${PROJECT_SOURCE_DIR}/pv/prop/property.hpp
+       ${PROJECT_SOURCE_DIR}/pv/prop/string.hpp
+       ${PROJECT_SOURCE_DIR}/pv/prop/binding/deviceoptions.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/cursor.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/cursorheader.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/header.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/ruler.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/selectableitem.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/signal.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/timemarker.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/trace.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/view.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/viewport.hpp
+       ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.hpp
+       ${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.hpp
+       ${PROJECT_SOURCE_DIR}/pv/widgets/popup.hpp
+       ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.hpp
 )
 
 if(ENABLE_DECODE)
        list(APPEND pulseview_TEST_SOURCES
                ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.cpp
-               ${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
                ${PROJECT_SOURCE_DIR}/pv/data/decode/annotation.cpp
+               ${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
+               ${PROJECT_SOURCE_DIR}/pv/data/decode/row.cpp
+               ${PROJECT_SOURCE_DIR}/pv/data/decode/rowdata.cpp
                ${PROJECT_SOURCE_DIR}/pv/prop/binding/decoderoptions.cpp
                ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.cpp
                ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.cpp
@@ -111,33 +101,24 @@ if(ENABLE_DECODE)
        )
 
        list(APPEND pulseview_TEST_HEADERS
-               ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.h
-               ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.h
-               ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.h
-               ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.h
+               ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.hpp
+               ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.hpp
+               ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.hpp
+               ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.hpp
        )
 endif()
 
-qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
-
-if(ENABLE_DECODE)
-       add_definitions(-DENABLE_DECODE)
+if(Qt5Core_FOUND)
+       qt5_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
+else()
+       qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
+       include(${QT_USE_FILE})
 endif()
 
-add_definitions(-DBOOST_TEST_DYN_LINK)
-add_definitions(${QT_DEFINITIONS})
-
-include_directories(
-       ${Boost_INCLUDE_DIRS}
-       ${PKGDEPS_INCLUDE_DIRS}
-)
-
-set(PULSEVIEW_LINK_LIBS
-       ${Boost_LIBRARIES}
-       ${CMAKE_THREAD_LIBS_INIT}
-       ${PKGDEPS_LIBRARIES}
-       ${QT_LIBRARIES}
-)
+# On MinGW we need to use static linking.
+if(NOT WIN32)
+       add_definitions(-DBOOST_TEST_DYN_LINK)
+endif()
 
 add_executable(pulseview-test
        ${pulseview_TEST_SOURCES}