CentOS_6 and RHEL 6 and 7 do not have Qt5

So for these we switch back to Qt4
bareos · Oct 3, 2018 · c00a6ed · c00a6ed
1 parent 2e209e8
commit c00a6ed
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec
@@ -198,7 +198,13 @@ BuildRequires: mtx
 %if 0%{?suse_version}
 BuildRequires: libqt5-qtbase-devel
 %else
+
+%if 0%{?centos_version} == 600 || 0%{?rhel_version} <= 700
+BuildRequires: libqt4-devel
+%else
 BuildRequires: qt5-qtbase-devel
+%endif
+
 %endif
 %endif
 

diff --git a/core/src/qt-tray-monitor/CMakeLists.txt b/core/src/qt-tray-monitor/CMakeLists.txt
@@ -29,7 +29,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-find_package(Qt5 COMPONENTS Core Widgets REQUIRED)
+find_package(Qt4)
+
+find_package(Qt5 COMPONENTS Core Widgets)
 
 IF(HAVE_WIN32)
    include_directories(
@@ -49,17 +51,21 @@ IF(HAVE_WIN32)
    LIST(APPEND SOURCES ../win32/qt-tray-monitor/traymon.rc)
 ENDIF()
 
-
-set(TRAYMON_LIBRARIES bareos-tray-monitor bareos)
-
+IF(Qt4_FOUND)
+  set(TRAYMON_LIBRARIES bareos-tray-monitor Qt4::QtGui bareos)
+ELSE()
+  set(TRAYMON_LIBRARIES bareos-tray-monitor bareos)
+ENDIF()
 
 IF(HAVE_WIN32)
    add_executable(bareos-tray-monitor WIN32 ${SOURCES} main.qrc)
 ELSE()
    add_executable(bareos-tray-monitor ${SOURCES} main.qrc)
 ENDIF()
 
-qt5_use_modules(bareos-tray-monitor Widgets)
+IF(Qt5Widgets_FOUND)
+  qt5_use_modules(bareos-tray-monitor Widgets)
+ENDIF()
 
 target_link_libraries(${TRAYMON_LIBRARIES})