Fix #957 and #874 by implementing the pane splitter

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17e28827aafe3f43e13b99eb8e9e379675e89a6d..b18b81a7c4841b6edf937a91c13d1cf70f006f37 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,10 +55,13 @@ endif()
 #= Dependencies
 #-------------------------------------------------------------------------------
 
-list(APPEND PKGDEPS libsigrokcxx>=0.4.0)
+list(APPEND PKGDEPS glib-2.0>=2.28.0)
+list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
+
+list(APPEND PKGDEPS libsigrokcxx>=0.5.0)
 
 if(ENABLE_DECODE)
-       list(APPEND PKGDEPS libsigrokdecode>=0.4.0)
+       list(APPEND PKGDEPS libsigrokdecode>=0.5.0)
 endif()
 
 if(ANDROID)
@@ -69,7 +72,6 @@ find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
 set(CMAKE_AUTOMOC TRUE)
-set(CMAKE_AUTORCC TRUE)
 
 find_package(Qt5 COMPONENTS Core Gui Widgets Svg REQUIRED)
 
@@ -154,6 +156,8 @@ set(PV_TITLE PulseView)
 set(PV_DESCRIPTION "A GUI for sigrok")
 set(PV_VERSION_STRING "0.4.0")
 
+set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION})
+
 include(GetGitRevisionDescription)
 
 # Append the revision hash unless we are exactly on a tagged release.
@@ -258,7 +262,6 @@ set(pulseview_SOURCES
        pv/widgets/sweeptimingwidget.cpp
        pv/widgets/timestampspinbox.cpp
        pv/widgets/wellarray.cpp
-       pulseview.qrc
 )
 
 # This list includes only QObject derived class headers.
@@ -320,6 +323,10 @@ set(pulseview_HEADERS
        pv/widgets/wellarray.hpp
 )
 
+set(pulseview_RESOURCES
+       pulseview.qrc
+)
+
 if(ENABLE_SIGNALS)
        list(APPEND pulseview_SOURCES signalhandler.cpp)
        list(APPEND pulseview_HEADERS signalhandler.hpp)
@@ -360,6 +367,8 @@ if(ANDROID)
        )
 endif()
 
+qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
+
 #===============================================================================
 #= Global Definitions
 #-------------------------------------------------------------------------------
@@ -435,9 +444,9 @@ if(ANDROID)
 endif()
 
 if(ANDROID)
-       add_library(${PROJECT_NAME} SHARED ${pulseview_SOURCES})
+       add_library(${PROJECT_NAME} SHARED ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC})
 else()
-       add_executable(${PROJECT_NAME} ${pulseview_SOURCES})
+       add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC})
 endif()
 
 target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})