Add QtXmlPatterns to CMake lists

Frank0587 · Jun 11, 2019 · 5f0be3c · 5f0be3c
1 parent 28b2df0
commit 5f0be3c
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -925,6 +925,7 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
         find_package(Qt5Core REQUIRED)
         find_package(Qt5Network REQUIRED)
         find_package(Qt5Xml REQUIRED)
+        find_package(Qt5XmlPatterns REQUIRED)
         if(BUILD_GUI)
             find_package(Qt5Widgets REQUIRED)
             find_package(Qt5PrintSupport REQUIRED)
@@ -1354,6 +1355,7 @@ else(NOT BUILD_QT5)
     message(STATUS "Qt5Core:             ${Qt5Core_VERSION}")
     message(STATUS "Qt5Network:          ${Qt5Network_VERSION}")
     message(STATUS "Qt5Xml:              ${Qt5Xml_VERSION}")
+    message(STATUS "Qt5XmlPatterns:      ${Qt5XmlPatterns_VERSION}")
     if (BUILD_GUI)
         message(STATUS "Qt5Widgets:          ${Qt5Widgets_VERSION}")
         message(STATUS "Qt5PrintSupport:     ${Qt5PrintSupport_VERSION}")

diff --git a/cMake/UseLibPack10x.cmake b/cMake/UseLibPack10x.cmake
@@ -96,6 +96,7 @@ set(QT_INCLUDE_DIR
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtTest
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtUiTools
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtXml
+    ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtXmlPatterns
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtOpenGl
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtWebKit
 )
@@ -118,6 +119,7 @@ set(QT_LIBRARIES
     optimized QtSql4.lib
     optimized QtTest4.lib
     optimized QtXml4.lib
+    optimized QtXmlPatterns4.lib
     optimized QtOpenGl4.lib
     optimized QtWebKit4.lib
     debug QtCored4.lib
@@ -128,6 +130,7 @@ set(QT_LIBRARIES
     debug QtSqld4.lib
     debug QtTestd4.lib
     debug QtXmld4.lib
+    debug QtXmlPatternsd4.lib
     debug QtOpenGld4.lib
     debug QtWebKitd4.lib
 )

diff --git a/cMake/UseLibPack6x.cmake b/cMake/UseLibPack6x.cmake
@@ -84,6 +84,7 @@ set(QT_INCLUDE_DIR
     ${FREECAD_LIBPACK_DIR}/include/QT/QtTest
     ${FREECAD_LIBPACK_DIR}/include/QT/QtUiTools
     ${FREECAD_LIBPACK_DIR}/include/QT/QtXml
+    ${FREECAD_LIBPACK_DIR}/include/QT/QtXmlPatterns
     ${FREECAD_LIBPACK_DIR}/include/QT/QtOpenGl
     ${FREECAD_LIBPACK_DIR}/include/QT/QtWebKit
 	)
@@ -102,6 +103,7 @@ set(QT_LIBRARIES
     optimized QtSql4.lib
     optimized QtTest4.lib
     optimized QtXml4.lib
+    optimized QtXmlPatterns4.lib
     optimized QtOpenGl4.lib
     optimized QtWebKit4.lib
     debug QtCored4.lib
@@ -112,6 +114,7 @@ set(QT_LIBRARIES
     debug QtSqld4.lib
     debug QtTestd4.lib
     debug QtXmld4.lib
+    debug QtXmlPatternsd4.lib
     debug QtOpenGld4.lib
     debug QtWebKitd4.lib
 )
@@ -316,10 +319,10 @@ set(OCC_LIBRARIES
     TKFeat
 )
 set(OCC_OCAF_LIBRARIES
-    TKCAF
-    TKXCAF
-    TKLCAF
-    TKXDESTEP
-    TKXDEIGES
+    TKCAF
+    TKXCAF
+    TKLCAF
+    TKXDESTEP
+    TKXDEIGES
 )
 set(OCC_FOUND TRUE) 
diff --git a/cMake/UseLibPack7x.cmake b/cMake/UseLibPack7x.cmake
@@ -93,6 +93,7 @@ set(QT_INCLUDE_DIR
     ${FREECAD_LIBPACK_DIR}/include/QT/QtTest
     ${FREECAD_LIBPACK_DIR}/include/QT/QtUiTools
     ${FREECAD_LIBPACK_DIR}/include/QT/QtXml
+    ${FREECAD_LIBPACK_DIR}/include/QT/QtXmlPatterns
     ${FREECAD_LIBPACK_DIR}/include/QT/QtOpenGl
     ${FREECAD_LIBPACK_DIR}/include/QT/QtWebKit
 	)
@@ -111,6 +112,7 @@ set(QT_LIBRARIES
     optimized QtSql4.lib
     optimized QtTest4.lib
     optimized QtXml4.lib
+    optimized QtXmlPatterns4.lib
     optimized QtOpenGl4.lib
     optimized QtWebKit4.lib
     debug QtCored4.lib
@@ -121,6 +123,7 @@ set(QT_LIBRARIES
     debug QtSqld4.lib
     debug QtTestd4.lib
     debug QtXmld4.lib
+    debug QtXmlPatternsd4.lib
     debug QtOpenGld4.lib
     debug QtWebKitd4.lib
 )
@@ -327,11 +330,11 @@ set(OCC_LIBRARIES
     TKFeat
 )
 set(OCC_OCAF_LIBRARIES
-    TKCAF
-    TKXCAF
-    TKLCAF
-    TKXDESTEP
-    TKXDEIGES
+    TKCAF
+    TKXCAF
+    TKLCAF
+    TKXDESTEP
+    TKXDEIGES
 )
 set(OCC_FOUND TRUE) 
 

diff --git a/cMake/UseLibPack8x.cmake b/cMake/UseLibPack8x.cmake
@@ -105,6 +105,7 @@ set(QT_INCLUDE_DIR
     ${FREECAD_LIBPACK_DIR}/include/QT/QtTest
     ${FREECAD_LIBPACK_DIR}/include/QT/QtUiTools
     ${FREECAD_LIBPACK_DIR}/include/QT/QtXml
+    ${FREECAD_LIBPACK_DIR}/include/QT/QtXmlPatterns
     ${FREECAD_LIBPACK_DIR}/include/QT/QtOpenGl
     ${FREECAD_LIBPACK_DIR}/include/QT/QtWebKit
 	)
@@ -123,6 +124,7 @@ set(QT_LIBRARIES
     optimized QtSql4.lib
     optimized QtTest4.lib
     optimized QtXml4.lib
+    optimized QtXmlPatterns4.lib
     optimized QtOpenGl4.lib
     optimized QtWebKit4.lib
     debug QtCored4.lib
@@ -133,6 +135,7 @@ set(QT_LIBRARIES
     debug QtSqld4.lib
     debug QtTestd4.lib
     debug QtXmld4.lib
+    debug QtXmlPatternsd4.lib
     debug QtOpenGld4.lib
     debug QtWebKitd4.lib
 )

diff --git a/cMake/UseLibPack9x.cmake b/cMake/UseLibPack9x.cmake
@@ -95,6 +95,7 @@ set(QT_INCLUDE_DIR
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.5/QtTest
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.5/QtUiTools
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.5/QtXml
+    ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.5/QtXmlPatterns
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.5/QtOpenGl
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.8.5/QtWebKit
 )
@@ -121,6 +122,7 @@ set(QT_LIBRARIES
     optimized QtSql4.lib
     optimized QtTest4.lib
     optimized QtXml4.lib
+    optimized QtXmlPatterns4.lib
     optimized QtOpenGl4.lib
     optimized QtWebKit4.lib
     debug QtCored4.lib
@@ -131,6 +133,7 @@ set(QT_LIBRARIES
     debug QtSqld4.lib
     debug QtTestd4.lib
     debug QtXmld4.lib
+    debug QtXmlPatternsd4.lib
     debug QtOpenGld4.lib
     debug QtWebKitd4.lib
 )

diff --git a/cMake/UseLibPackCustom.cmake b/cMake/UseLibPackCustom.cmake
@@ -104,6 +104,7 @@ set(QT_INCLUDE_DIR
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.5.3/QtTest
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.5.3/QtUiTools
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.5.3/QtXml
+    ${FREECAD_LIBPACK_DIR}/include/Qt-4.5.3/QtXmlPatterns
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.5.3/QtOpenGl
     ${FREECAD_LIBPACK_DIR}/include/Qt-4.5.3/QtWebKit
 )
@@ -126,6 +127,7 @@ set(QT_LIBRARIES
     optimized QtSql4.lib
     optimized QtTest4.lib
     optimized QtXml4.lib
+    optimized QtXmlPatterns4.lib
     optimized QtOpenGl4.lib
     optimized QtWebKit4.lib
     debug QtCored4.lib
@@ -136,6 +138,7 @@ set(QT_LIBRARIES
     debug QtSqld4.lib
     debug QtTestd4.lib
     debug QtXmld4.lib
+    debug QtXmlPatternsd4.lib
     debug QtOpenGld4.lib
     debug QtWebKitd4.lib
 )

diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt
@@ -17,8 +17,20 @@ include_directories(
     ${PYTHON_INCLUDE_DIRS}
     ${XercesC_INCLUDE_DIRS}
     ${QT_QTCORE_INCLUDE_DIR}
-    ${QT_QTXMLPATTERNS_INCLUDE_DIR}
 )
+
+if(BUILD_QT5)
+    include_directories(
+        ${Qt5XmlPatterns_INCLUDE_DIRS}
+    )
+    set(QtXmlPatternsLib ${Qt5XmlPatterns_LIBRARIES})
+else(BUILD_QT5)
+    include_directories(
+        ${QT_QTXMLPATTERNS_INCLUDE_DIR}
+    )
+    set(QtXmlPatternsLib ${QT_QTXMLPATTERNS_LIBRARY})
+endif(BUILD_QT5)
+
 link_directories(${OCC_LIBRARY_DIR})
 
 set(TechDrawLIBS
@@ -180,7 +192,7 @@ endif(FREECAD_USE_PCH)
 
 add_library(TechDraw SHARED ${TechDraw_SRCS} ${Draw_SRCS} ${TechDrawAlgos_SRCS}
                            ${Geometry_SRCS} ${Python_SRCS})
-target_link_libraries(TechDraw ${TechDrawLIBS};${QT_QTXML_LIBRARY};${QT_QTXMLPATTERNS_LIBRARY};${TechDraw})
+target_link_libraries(TechDraw ${TechDrawLIBS};${QT_QTXML_LIBRARY};${QtXmlPatternsLib};${TechDraw})
 
 ADD_CUSTOM_COMMAND(TARGET TechDraw
                    POST_BUILD

diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt
@@ -15,8 +15,18 @@ include_directories(
     ${OCC_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
     ${XercesC_INCLUDE_DIRS}
-    ${QT_QTXMLPATTERNS_INCLUDE_DIR}
 )
+
+if(BUILD_QT5)
+    include_directories(
+        ${Qt5XmlPatterns_INCLUDE_DIRS}
+    )
+else(BUILD_QT5)
+    include_directories(
+        ${QT_QTXMLPATTERNS_INCLUDE_DIR}
+    )
+endif(BUILD_QT5)
+
 link_directories(${OCC_LIBRARY_DIR})
 
 set(TechDrawGui_LIBS