CMakeLists.txt: Enable unit tests by default.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51170dee62255b9aa5fe6735423d945f73d83f9b..77b0137db22b7b6cab80d8aee7c97fecb8c542bf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
 option(DISABLE_WERROR "Build without -Werror" FALSE)
 option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
 option(ENABLE_DECODE "Build with libsigrokdecode" TRUE)
-option(ENABLE_TESTS "Enable unit tests" FALSE)
+option(ENABLE_TESTS "Enable unit tests" TRUE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
 option(FORCE_QT4 "Force use of Qt4 even if Qt5 is available" FALSE)
 
@@ -124,26 +124,14 @@ set(PV_DESCRIPTION "A GUI for sigrok")
 set(PV_VERSION_STRING "0.3.0")
 
 include(GetGitRevisionDescription)
-git_describe(PV_TAG_VERSION_STRING --tags --dirty)
 
-if(NOT PV_TAG_VERSION_STRING AND EXISTS "${PROJECT_SOURCE_DIR}/VERSION")
-       # Read the version from a file that is distributed with
-       # the source package (see writepackageversion.cmake).
-       file(STRINGS "${PROJECT_SOURCE_DIR}/VERSION" PV_TAG_VERSION_STRING LIMIT_COUNT 1)
-endif()
-
-if(PV_TAG_VERSION_STRING MATCHES
-               "^pulseview-([0-9]+\\.[0-9]+\\.[0-9]+)(-[0-9a-z]+)?(-g[-0-9a-z]+)?$")
-       set(PV_TAG_VERSION ${CMAKE_MATCH_1})
-       set(PV_TAG_PATCHLEVEL ${CMAKE_MATCH_2})
-       set(PV_TAG_REVHASH ${CMAKE_MATCH_3})
-
-       if(PV_VERSION_STRING VERSION_GREATER ${PV_TAG_VERSION})
-               # Tagged version older than current one: indicate pre-release.
-               set(PV_VERSION_STRING "${PV_VERSION_STRING}-pre${PV_TAG_REVHASH}")
-       else()
-               # For post-release changes, indicate the patch level.
-               set(PV_VERSION_STRING "${PV_TAG_VERSION}${PV_TAG_PATCHLEVEL}${PV_TAG_REVHASH}")
+# Append the revision hash unless we are exactly on a tagged release.
+git_describe(PV_TAG_VERSION_STRING --match "pulseview-${PV_VERSION_STRING}" --exact-match)
+if(NOT PV_TAG_VERSION_STRING)
+       get_git_head_revision(PV_REVSPEC PV_HASH)
+       if(PV_HASH)
+               string(SUBSTRING "${PV_HASH}" 0 7 PV_SHORTHASH)
+               set(PV_VERSION_STRING "${PV_VERSION_STRING}-git-${PV_SHORTHASH}")
        endif()
 endif()
 
@@ -210,6 +198,7 @@ set(pulseview_SOURCES
        pv/view/rowitem.cpp
        pv/view/ruler.cpp
        pv/view/signal.cpp
+       pv/view/signalscalehandle.cpp
        pv/view/timeitem.cpp
        pv/view/timemarker.cpp
        pv/view/trace.cpp
@@ -263,6 +252,7 @@ set(pulseview_HEADERS
        pv/view/rowitem.hpp
        pv/view/ruler.hpp
        pv/view/signal.hpp
+       pv/view/signalscalehandle.hpp
        pv/view/timeitem.hpp
        pv/view/timemarker.hpp
        pv/view/trace.hpp
@@ -470,7 +460,6 @@ set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING)
 set(CPACK_SOURCE_IGNORE_FILES ${CMAKE_CURRENT_BINARY_DIR} ".gitignore" ".git")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PV_VERSION_STRING}")
 set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_INSTALL_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/CMake/writepackageversion.cmake)
 
 include(CPack)