diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index c942824fd4f9dc0ceddb82b6b9af6c3fdeeeee8a..2897728c4d77dc974c5ec02c185003ba3c0123ab 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 445b9544e714a6636017f79aa4f309c5e05cb35c..48e732b8699be6140bcf34198b2278218af3db18 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()