From eca7cdb46df0d23495e03687a9cfac1561937154 Mon Sep 17 00:00:00 2001
From: dsm <41967334+dsm@users.noreply.github.com>
Date: Fri, 26 Jul 2024 12:55:50 +0300
Subject: [PATCH] changed cpp standard before qt6.7 cpp17 otherwise cpp20

---
 CMakeLists.txt                     |  4 +++-
 qucs-activefilter/CMakeLists.txt   |  7 ++++++-
 qucs-attenuator/CMakeLists.txt     |  8 +++++++-
 qucs-filter/CMakeLists.txt         |  8 +++++++-
 qucs-powercombining/CMakeLists.txt |  8 +++++++-
 qucs-transcalc/CMakeLists.txt      |  8 +++++++-
 qucs/CMakeLists.txt                | 14 ++++++++++----
 7 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37f82dd4b..149d19c48 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,9 @@ else()
     set(QT_VERSION_MAJOR 5)
 endif()
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets LinguistTools)
-message(STATUS "QT Major Version: " ${QT_VERSION_MAJOR})
+set(QT_VERSION ${Qt${QT_VERSION_MAJOR}Core_VERSION})
+
+message(STATUS "Qt Version: " ${QT_VERSION})
 
 add_definitions(${QT_DEFINITIONS})
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/qucs-activefilter/CMakeLists.txt b/qucs-activefilter/CMakeLists.txt
index 1c315a7d5..faf7dfbc5 100644
--- a/qucs-activefilter/CMakeLists.txt
+++ b/qucs-activefilter/CMakeLists.txt
@@ -52,8 +52,13 @@ else()
       )
 endif()
 
+set(QT_VERSION ${Qt${QT_VERSION_MAJOR}Core_VERSION})
 
-set(CMAKE_CXX_STANDARD 20)
+if (${QT_VERSION} VERSION_LESS "6.7.0")
+    set(CMAKE_CXX_STANDARD 17)
+else()
+    set(CMAKE_CXX_STANDARD 20)
+endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/qucs-attenuator/CMakeLists.txt b/qucs-attenuator/CMakeLists.txt
index 218c6058d..e3cf86328 100644
--- a/qucs-attenuator/CMakeLists.txt
+++ b/qucs-attenuator/CMakeLists.txt
@@ -39,7 +39,13 @@ include_directories(
       ${Qt${QT_VERSION_MAJOR}Widgets_INCLUDE_DIRS}
       )
 
-set(CMAKE_CXX_STANDARD 20)
+set(QT_VERSION ${Qt${QT_VERSION_MAJOR}Core_VERSION})
+
+if (${QT_VERSION} VERSION_LESS "6.7.0")
+    set(CMAKE_CXX_STANDARD 17)
+else()
+    set(CMAKE_CXX_STANDARD 20)
+endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/qucs-filter/CMakeLists.txt b/qucs-filter/CMakeLists.txt
index 01f1c309f..2b7d00f8c 100644
--- a/qucs-filter/CMakeLists.txt
+++ b/qucs-filter/CMakeLists.txt
@@ -42,7 +42,13 @@ include_directories(
       )
 
 
-set(CMAKE_CXX_STANDARD 20)
+set(QT_VERSION ${Qt${QT_VERSION_MAJOR}Core_VERSION})
+
+if (${QT_VERSION} VERSION_LESS "6.7.0")
+    set(CMAKE_CXX_STANDARD 17)
+else()
+    set(CMAKE_CXX_STANDARD 20)
+endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/qucs-powercombining/CMakeLists.txt b/qucs-powercombining/CMakeLists.txt
index a109e47c9..4cf74924e 100644
--- a/qucs-powercombining/CMakeLists.txt
+++ b/qucs-powercombining/CMakeLists.txt
@@ -51,7 +51,13 @@ else()
         )
 endif()
 
-set(CMAKE_CXX_STANDARD 20)
+set(QT_VERSION ${Qt${QT_VERSION_MAJOR}Core_VERSION})
+
+if (${QT_VERSION} VERSION_LESS "6.7.0")
+    set(CMAKE_CXX_STANDARD 17)
+else()
+    set(CMAKE_CXX_STANDARD 20)
+endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/qucs-transcalc/CMakeLists.txt b/qucs-transcalc/CMakeLists.txt
index c89a2e93d..2623ecb4e 100644
--- a/qucs-transcalc/CMakeLists.txt
+++ b/qucs-transcalc/CMakeLists.txt
@@ -41,7 +41,13 @@ include_directories(
       )
 
 
-set(CMAKE_CXX_STANDARD 20)
+set(QT_VERSION ${Qt${QT_VERSION_MAJOR}Core_VERSION})
+
+if (${QT_VERSION} VERSION_LESS "6.7.0")
+    set(CMAKE_CXX_STANDARD 17)
+else()
+    set(CMAKE_CXX_STANDARD 20)
+endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/qucs/CMakeLists.txt b/qucs/CMakeLists.txt
index db59bffeb..9d0000397 100755
--- a/qucs/CMakeLists.txt
+++ b/qucs/CMakeLists.txt
@@ -81,12 +81,18 @@ CONFIGURE_FILE (
 INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
 
 IF(QT_VERSION_MAJOR EQUAL 6)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
+    set(CMAKE_AUTOUIC ON)
+    set(CMAKE_AUTOMOC ON)
+    set(CMAKE_AUTORCC ON)
 ENDIF()
 
-set(CMAKE_CXX_STANDARD 20)
+set(QT_VERSION ${Qt${QT_VERSION_MAJOR}Core_VERSION})
+
+if (${QT_VERSION} VERSION_LESS "6.7.0")
+    set(CMAKE_CXX_STANDARD 17)
+else()
+    set(CMAKE_CXX_STANDARD 20)
+endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)