remove qtxmlpatterns from cmake scripts
This commit is contained in:
committed by
Chris Hennes
parent
4527112392
commit
b49aca5d55
1
.github/workflows/sub_buildUbuntu2004.yml
vendored
1
.github/workflows/sub_buildUbuntu2004.yml
vendored
@@ -108,7 +108,6 @@ jobs:
|
||||
libqt5opengl5-dev \
|
||||
libqt5svg5-dev \
|
||||
libqt5x11extras5-dev \
|
||||
libqt5xmlpatterns5-dev \
|
||||
libshiboken2-dev \
|
||||
libspnav-dev \
|
||||
libvtk7-dev \
|
||||
|
||||
1
.github/workflows/sub_lint.yml
vendored
1
.github/workflows/sub_lint.yml
vendored
@@ -442,7 +442,6 @@ jobs:
|
||||
libqt5opengl5-dev \
|
||||
libqt5svg5-dev \
|
||||
libqt5x11extras5-dev \
|
||||
libqt5xmlpatterns5-dev \
|
||||
libshiboken2-dev \
|
||||
libspnav-dev \
|
||||
libvtk7-dev \
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user