From ddea2d7560bdabc7238886a89bf809987cc04775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Insaurralde=20Avalos?= <36372335+adrianinsaval@users.noreply.github.com> Date: Sat, 13 Jul 2024 23:11:36 -0400 Subject: [PATCH] remove qtxmlpatterns from cmake scripts --- .github/workflows/sub_buildUbuntu2004.yml | 1 - .github/workflows/sub_lint.yml | 1 - cMake/FreeCAD_Helpers/SetupQt.cmake | 4 +--- cMake/UseLibPackCLbundler.cmake | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/sub_buildUbuntu2004.yml b/.github/workflows/sub_buildUbuntu2004.yml index 2fedfe630b..6d1e8135e3 100644 --- a/.github/workflows/sub_buildUbuntu2004.yml +++ b/.github/workflows/sub_buildUbuntu2004.yml @@ -108,7 +108,6 @@ jobs: libqt5opengl5-dev \ libqt5svg5-dev \ libqt5x11extras5-dev \ - libqt5xmlpatterns5-dev \ libshiboken2-dev \ libspnav-dev \ libvtk7-dev \ diff --git a/.github/workflows/sub_lint.yml b/.github/workflows/sub_lint.yml index cb0d564670..0de636c96c 100644 --- a/.github/workflows/sub_lint.yml +++ b/.github/workflows/sub_lint.yml @@ -442,7 +442,6 @@ jobs: libqt5opengl5-dev \ libqt5svg5-dev \ libqt5x11extras5-dev \ - libqt5xmlpatterns5-dev \ libshiboken2-dev \ libspnav-dev \ libvtk7-dev \ diff --git a/cMake/FreeCAD_Helpers/SetupQt.cmake b/cMake/FreeCAD_Helpers/SetupQt.cmake index fa911c80b4..c3dc0eeedd 100644 --- a/cMake/FreeCAD_Helpers/SetupQt.cmake +++ b/cMake/FreeCAD_Helpers/SetupQt.cmake @@ -1,9 +1,7 @@ # -------------------------------- Qt -------------------------------- set(FREECAD_QT_COMPONENTS Core Concurrent Network Xml) -if (FREECAD_QT_MAJOR_VERSION EQUAL 5) - list (APPEND FREECAD_QT_COMPONENTS XmlPatterns) -elseif (FREECAD_QT_MAJOR_VERSION EQUAL 6) +if (FREECAD_QT_MAJOR_VERSION EQUAL 6) set (Qt6Core_MOC_EXECUTABLE Qt6::moc) endif() diff --git a/cMake/UseLibPackCLbundler.cmake b/cMake/UseLibPackCLbundler.cmake index 22177651c5..7ed15586b2 100644 --- a/cMake/UseLibPackCLbundler.cmake +++ b/cMake/UseLibPackCLbundler.cmake @@ -39,7 +39,6 @@ set (Qt5UiPlugin_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5UiPlugin CACHE PATH "") set (Qt5UiTools_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5UiTools CACHE PATH "") set (Qt5Widgets_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Widgets CACHE PATH "") set (Qt5Xml_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Xml CACHE PATH "") -set (Qt5XmlPatterns_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5XmlPatterns CACHE PATH "") find_library(XercesC_LIBRARY_RELEASE xerces-c_3 "${FREECAD_LIBPACK_DIR}/lib") find_library(XercesC_LIBRARY_DEBUG xerces-c_3D "${FREECAD_LIBPACK_DIR}/lib")