From 5135650f8a4adf9ee50fe8a475fea26893bee91b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 11 Jun 2024 14:42:00 +0200
Subject: [PATCH] Updated to qt 6.7.1
---
cmake/CMakeLists.txt | 6 +++---
cmake/FindQWT6.cmake | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index c942824f..2897728c 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -26,9 +26,9 @@ set_property(CACHE OPENFLIPPER_CXX_STANDARD PROPERTY STRINGS 17 20 23)
# ACG Environment default settings
# This is ugly but currently we need to work around the default installed on debian
-if ( EXISTS /ACG/acgdev/gcc-x86_64/qt/6.7.0/gcc_64 )
+if ( EXISTS /ACG/acgdev/gcc-x86_64/qt/6.7.1/gcc_64 )
# Default to this install path for QT%_INSTALL_DIR
- set (QT_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt/6.7.0/gcc_64/ CACHE PATH "Qt6 install path set for ACG environment using QT 6.7.0" )
+ set (QT_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt/6.7.1/gcc_64/ CACHE PATH "Qt6 install path set for ACG environment using QT 6.7.1" )
endif()
if ( WIN32 )
@@ -184,7 +184,7 @@ if ( WIN32 )
endif()
endif()
-set (OF_MAX_QT_VERSION "6.7.0")
+set (OF_MAX_QT_VERSION "6.7.1")
if (${Qt_VERSION_STRING} STRGREATER ${OF_MAX_QT_VERSION})
message(WARNING "Detected QT Version ( ${Qt_VERSION_STRING} ) higher than ${OF_MAX_QT_VERSION}!\n" "OpenFlipper has not been tested with this QT Version.")
diff --git a/cmake/FindQWT6.cmake b/cmake/FindQWT6.cmake
index 445b9544..48e732b8 100644
--- a/cmake/FindQWT6.cmake
+++ b/cmake/FindQWT6.cmake
@@ -92,7 +92,11 @@ else()
if (${Qt_VERSION_STRING} VERSION_EQUAL "6.7.0")
SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.3.0-qt6.7.0")
else()
+ if (${Qt_VERSION_STRING} VERSION_EQUAL "6.7.1")
+ SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.3.0-qt6.7.1")
+ else()
SET(ACG_SEARCH_PATH "/usr/local/qwt/")
+ endif()
endif()
endif()
endif()
--
GitLab