Merge pull request #629 from ra3xdh/revert_with_qt6

Revert WITH_QT6
ra3xdh · Mar 6, 2024 · d7b3118 · d7b3118
2 parents cc991c6 + 4e83433
commit d7b3118
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 21 deletions.
diff --git a/.github/workflows/cmake_qt6.yml b/.github/workflows/cmake_qt6.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -B ${{github.workspace}}/build -DWITH_QT6=ON -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
     - name: Build
       # Build your program with the given configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,8 +33,11 @@ endif()
 
 message(STATUS "${PROJECT_NAME} ${CMAKE_INSTALL_PREFIX} ${qucs-suite_BINARY_DIR}" )
 
-set(QT_DEFAULT_MAJOR_VERSION 6)
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets LinguistTools)
+if(WITH_QT6)
+    set(QT_VERSION_MAJOR 6)
+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})
 

diff --git a/README.md b/README.md
@@ -64,12 +64,11 @@ installation steps. Default installation directory will be `/usr/local` if
 
 #### Qt6
 
-Since v1.0.1 Qucs-S supports build with Qt6. Set the `QT_DIR` environment variable 
-to tell CMake use the Qt6. For example use the following command sequence for Ubuntu-22.04
+Since v1.0.1 Qucs-S supports build with Qt6. Set the `WITH_QT6` flag to tell CMake use the Qt6. 
+For example use the following command sequence for Ubuntu-22.04
 
 ~~~
-export QT_DIR=/usr/lib/x86_64-linux-gnu/cmake/Qt6
-cmake ..  -DCMAKE_INSTALL_PREFIX=/your_install_prefix/
+cmake .. -DWITH_QT6=ON -DCMAKE_INSTALL_PREFIX=/your_install_prefix/
 ~~~ 
 
 ### Running

diff --git a/qucs-activefilter/CMakeLists.txt b/qucs-activefilter/CMakeLists.txt
@@ -28,7 +28,12 @@ CONFIGURE_FILE (
 
 INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
+if(WITH_QT6)
+    set(QT_VERSION_MAJOR 6)
+else()
+    set(QT_VERSION_MAJOR 5)
+endif()
+
 
 if(QT_VERSION_MAJOR EQUAL 6)
   find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core  Widgets Svg SvgWidgets)

diff --git a/qucs-attenuator/CMakeLists.txt b/qucs-attenuator/CMakeLists.txt
@@ -27,7 +27,11 @@ CONFIGURE_FILE (
 
 INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets)
+if(WITH_QT6)
+    set(QT_VERSION_MAJOR 6)
+else()
+    set(QT_VERSION_MAJOR 5)
+endif()
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets)
 include_directories(
       ${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DIRS}

diff --git a/qucs-filter/CMakeLists.txt b/qucs-filter/CMakeLists.txt
@@ -28,7 +28,12 @@ CONFIGURE_FILE (
 
 INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets)
+if(WITH_QT6)
+    set(QT_VERSION_MAJOR 6)
+else()
+    set(QT_VERSION_MAJOR 5)
+endif()
+
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets)
 include_directories(
       ${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DIRS}

diff --git a/qucs-powercombining/CMakeLists.txt b/qucs-powercombining/CMakeLists.txt
@@ -28,7 +28,12 @@ CONFIGURE_FILE (
 
 INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
+if(WITH_QT6)
+    set(QT_VERSION_MAJOR 6)
+else()
+    set(QT_VERSION_MAJOR 5)
+endif()
+
 if(QT_VERSION_MAJOR EQUAL 6)
     find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core  Widgets Svg SvgWidgets)
     include_directories(

diff --git a/qucs-transcalc/CMakeLists.txt b/qucs-transcalc/CMakeLists.txt
@@ -27,7 +27,12 @@ CONFIGURE_FILE (
 
 INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets )
+if(WITH_QT6)
+    set(QT_VERSION_MAJOR 6)
+else()
+    set(QT_VERSION_MAJOR 5)
+endif()
+
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets )
 include_directories(
       ${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DIRS}

diff --git a/qucs/CMakeLists.txt b/qucs/CMakeLists.txt
@@ -54,7 +54,12 @@ endif()
 add_compile_definitions(HAVE_CONFIG_H)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets Svg Xml PrintSupport)
+if(WITH_QT6)
+    set(QT_VERSION_MAJOR 6)
+else()
+    set(QT_VERSION_MAJOR 5)
+endif()
+
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets Svg Xml PrintSupport)
 include_directories(
       ${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DIRS}

diff --git a/qucs/components/CMakeLists.txt b/qucs/components/CMakeLists.txt
@@ -242,7 +242,6 @@ optimizedialog.h
 spicefile.h
 )
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 
 IF(QT_VERSION_MAJOR EQUAL 6)
     qt6_wrap_cpp(COMPONENTS_MOC_SRCS ${COMPONENTS_MOC_HDRS})

diff --git a/qucs/diagrams/CMakeLists.txt b/qucs/diagrams/CMakeLists.txt
@@ -33,7 +33,6 @@ SET(DIAGRAMS_MOC_HDRS
 diagramdialog.h
 markerdialog.h
 )
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 
 IF(QT_VERSION_MAJOR EQUAL 6)
     qt6_wrap_cpp( DIAGRAMS_MOC_SRCS ${DIAGRAMS_MOC_HDRS} )

diff --git a/qucs/dialogs/CMakeLists.txt b/qucs/dialogs/CMakeLists.txt
@@ -72,7 +72,6 @@ SET(DIALOGS_UIC_HDRS
 searchdialog.ui
 )
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 
 IF(QT_VERSION_MAJOR EQUAL 6)
     QT6_WRAP_CPP( DIALOGS_MOC_SRCS ${DIALOGS_MOC_HDRS} )

diff --git a/qucs/extsimkernels/CMakeLists.txt b/qucs/extsimkernels/CMakeLists.txt
@@ -45,7 +45,6 @@ customsimdialog.h
 simsettingsdialog.h
 )
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 
 IF(QT_VERSION_MAJOR EQUAL 6)
     QT6_WRAP_CPP( EXTSIMKERNELS_MOC_SRCS ${EXTSIMKERNELS_MOC_HDRS} )

diff --git a/qucs/paintings/CMakeLists.txt b/qucs/paintings/CMakeLists.txt
@@ -38,7 +38,6 @@ graphictextdialog.h
 id_dialog.h
 )
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 
 IF(QT_VERSION_MAJOR EQUAL 6)
     QT6_WRAP_CPP( PAINTINGS_MOC_SRCS ${PAINTINGS_MOC_HDRS} )

diff --git a/qucs/qt3_compat/CMakeLists.txt b/qucs/qt3_compat/CMakeLists.txt
@@ -30,7 +30,6 @@ q3scrollview.h
 q3frame.h
 )
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 
 IF(QT_VERSION_MAJOR EQUAL 6)
     QT6_WRAP_CPP( QT3_COMPAT_SRCS ${QT3_COMPAT_MOC_HDRS} )

diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
@@ -12,9 +12,8 @@ file (GLOB TRANSLATIONS_FILES qucs_*.ts)
 
 # WARNING: make clean might delete the source .ts files! Danger!
 option (UPDATE_TRANSLATIONS "Update source translation translations/*.ts" "OFF")
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 
-IF(QT_VERSION_MAJOR EQUAL 6)
+IF(WITH_QT6)
 IF (UPDATE_TRANSLATIONS)
   QT6_CREATE_TRANSLATION ( QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES})
 ELSE (UPDATE_TRANSLATIONS)