From fe1ee63f2ff2b5ddf90dc0aa2834302dfcbd8257 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Mon, 12 Feb 2024 19:08:09 +0100 Subject: [PATCH] Clean SetupQt.cmake (#12335) * Update SetupQt.cmake --- cMake/FreeCAD_Helpers/SetupQt.cmake | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/cMake/FreeCAD_Helpers/SetupQt.cmake b/cMake/FreeCAD_Helpers/SetupQt.cmake index 7fcdfaf536..0a22059a18 100644 --- a/cMake/FreeCAD_Helpers/SetupQt.cmake +++ b/cMake/FreeCAD_Helpers/SetupQt.cmake @@ -6,26 +6,29 @@ if (FREECAD_QT_MAJOR_VERSION EQUAL 5) elseif (FREECAD_QT_MAJOR_VERSION EQUAL 6) set (Qt6Core_MOC_EXECUTABLE Qt6::moc) endif() + if(BUILD_GUI) - if (FREECAD_QT_MAJOR_VERSION EQUAL 6) - list (APPEND FREECAD_QT_COMPONENTS GuiTools) - list (APPEND FREECAD_QT_COMPONENTS SvgWidgets) - elseif (FREECAD_QT_MAJOR_VERSION EQUAL 5) + if (FREECAD_QT_MAJOR_VERSION EQUAL 5) if (WIN32) list (APPEND FREECAD_QT_COMPONENTS WinExtras) endif() - endif() - list (APPEND FREECAD_QT_COMPONENTS OpenGL PrintSupport Svg UiTools Widgets LinguistTools) - if (FREECAD_QT_MAJOR_VERSION EQUAL 6) + elseif (FREECAD_QT_MAJOR_VERSION EQUAL 6) + list (APPEND FREECAD_QT_COMPONENTS GuiTools) + list (APPEND FREECAD_QT_COMPONENTS SvgWidgets) list (APPEND FREECAD_QT_COMPONENTS Core5Compat) endif() + + list (APPEND FREECAD_QT_COMPONENTS OpenGL PrintSupport Svg UiTools Widgets LinguistTools) + if (BUILD_WEB) list (APPEND FREECAD_QT_COMPONENTS WebEngineWidgets) endif() + if(BUILD_DESIGNER_PLUGIN) list (APPEND FREECAD_QT_COMPONENTS Designer) endif() endif() + if (ENABLE_DEVELOPER_TESTS) list (APPEND FREECAD_QT_COMPONENTS Test) endif () @@ -37,6 +40,7 @@ foreach(COMPONENT IN LISTS FREECAD_QT_COMPONENTS) set(Qt${COMPONENT}_FOUND ${Qt${FREECAD_QT_MAJOR_VERSION}${COMPONENT}_FOUND}) set(Qt${COMPONENT}_VERSION ${Qt${FREECAD_QT_MAJOR_VERSION}${COMPONENT}_VERSION}) endforeach() + set(CMAKE_AUTOMOC TRUE) set(CMAKE_AUTOUIC TRUE) set(QtCore_MOC_EXECUTABLE ${Qt${FREECAD_QT_MAJOR_VERSION}Core_MOC_EXECUTABLE}) @@ -75,13 +79,13 @@ if (Qt${FREECAD_QT_MAJOR_VERSION}Core_VERSION VERSION_LESS 5.15.0) # Since Qt 5.15 Q_DISABLE_COPY_MOVE is defined set (HAVE_Q_DISABLE_COPY_MOVE 0) - configure_file(${CMAKE_SOURCE_DIR}/src/QtCore.h.cmake ${CMAKE_BINARY_DIR}/src/QtCore.h) else() # Since Qt 5.15 Q_DISABLE_COPY_MOVE is defined set (HAVE_Q_DISABLE_COPY_MOVE 1) - configure_file(${CMAKE_SOURCE_DIR}/src/QtCore.h.cmake ${CMAKE_BINARY_DIR}/src/QtCore.h) endif() +configure_file(${CMAKE_SOURCE_DIR}/src/QtCore.h.cmake ${CMAKE_BINARY_DIR}/src/QtCore.h) + function(qt_find_and_add_translation _qm_files _tr_dir _qm_dir) file(GLOB _ts_files ${_tr_dir}) set_source_files_properties(${_ts_files} PROPERTIES OUTPUT_LOCATION ${_qm_dir})