SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build when both Qt version are installed

Browse Source
This commit is contained in:
Vadim Kuznetsov 2024-03-06 10:48:56 +03:00
parent f9ec56adf9
commit 4e83433c49
7 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qucs/components/CMakeLists.txt
View File

@ -242,7 +242,6 @@ optimizedialog.h
spicefile.h spicefile.h
) )
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
IF(QT_VERSION_MAJOR EQUAL 6) IF(QT_VERSION_MAJOR EQUAL 6)
qt6_wrap_cpp(COMPONENTS_MOC_SRCS ${COMPONENTS_MOC_HDRS}) qt6_wrap_cpp(COMPONENTS_MOC_SRCS ${COMPONENTS_MOC_HDRS})

1
qucs/diagrams/CMakeLists.txt
View File

@ -33,7 +33,6 @@ SET(DIAGRAMS_MOC_HDRS
diagramdialog.h diagramdialog.h
markerdialog.h markerdialog.h
) )
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
IF(QT_VERSION_MAJOR EQUAL 6) IF(QT_VERSION_MAJOR EQUAL 6)
qt6_wrap_cpp( DIAGRAMS_MOC_SRCS ${DIAGRAMS_MOC_HDRS} ) qt6_wrap_cpp( DIAGRAMS_MOC_SRCS ${DIAGRAMS_MOC_HDRS} )

1
qucs/dialogs/CMakeLists.txt
View File

@ -72,7 +72,6 @@ SET(DIALOGS_UIC_HDRS
searchdialog.ui searchdialog.ui
) )
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
IF(QT_VERSION_MAJOR EQUAL 6) IF(QT_VERSION_MAJOR EQUAL 6)
QT6_WRAP_CPP( DIALOGS_MOC_SRCS ${DIALOGS_MOC_HDRS} ) QT6_WRAP_CPP( DIALOGS_MOC_SRCS ${DIALOGS_MOC_HDRS} )

1
qucs/extsimkernels/CMakeLists.txt
View File

@ -45,7 +45,6 @@ customsimdialog.h
simsettingsdialog.h simsettingsdialog.h
) )
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
IF(QT_VERSION_MAJOR EQUAL 6) IF(QT_VERSION_MAJOR EQUAL 6)
QT6_WRAP_CPP( EXTSIMKERNELS_MOC_SRCS ${EXTSIMKERNELS_MOC_HDRS} ) QT6_WRAP_CPP( EXTSIMKERNELS_MOC_SRCS ${EXTSIMKERNELS_MOC_HDRS} )

1
qucs/paintings/CMakeLists.txt
View File

@ -38,7 +38,6 @@ graphictextdialog.h
id_dialog.h id_dialog.h
) )
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
IF(QT_VERSION_MAJOR EQUAL 6) IF(QT_VERSION_MAJOR EQUAL 6)
QT6_WRAP_CPP( PAINTINGS_MOC_SRCS ${PAINTINGS_MOC_HDRS} ) QT6_WRAP_CPP( PAINTINGS_MOC_SRCS ${PAINTINGS_MOC_HDRS} )

1
qucs/qt3_compat/CMakeLists.txt
View File

@ -30,7 +30,6 @@ q3scrollview.h
q3frame.h q3frame.h
) )
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
IF(QT_VERSION_MAJOR EQUAL 6) IF(QT_VERSION_MAJOR EQUAL 6)
QT6_WRAP_CPP( QT3_COMPAT_SRCS ${QT3_COMPAT_MOC_HDRS} ) QT6_WRAP_CPP( QT3_COMPAT_SRCS ${QT3_COMPAT_MOC_HDRS} )

3
translations/CMakeLists.txt
View File

@ -12,9 +12,8 @@ file (GLOB TRANSLATIONS_FILES qucs_*.ts)
# WARNING: make clean might delete the source .ts files! Danger! # WARNING: make clean might delete the source .ts files! Danger!
option (UPDATE_TRANSLATIONS "Update source translation translations/*.ts" "OFF") 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) IF (UPDATE_TRANSLATIONS)
QT6_CREATE_TRANSLATION ( QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES}) QT6_CREATE_TRANSLATION ( QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES})
ELSE (UPDATE_TRANSLATIONS) ELSE (UPDATE_TRANSLATIONS)