remove superfluous Qt includes

2016-12-13 15:40:49 +01:00 · 2016-12-13 15:40:49 +01:00 · 166fc624eb
commit 166fc624eb
parent 433202a881
26 changed files with 8 additions and 42 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -14,6 +14,7 @@ cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)

 if(COMMAND cmake_policy)
    cmake_policy(SET CMP0003 NEW)
+    cmake_policy(SET CMP0020 NEW)
    # added in cmake 3.0
    if(POLICY CMP0050)
        cmake_policy(SET CMP0050 OLD)
@ -714,7 +715,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
    # It adds a reverse dependency to solve this
    # This has the unfortunate side effect that some files are always rebuilt
    # There is probably a cleaner solution than this
-    macro(fc_wrap_cpp outfiles )
+    macro(fc_wrap_cpp outfiles)
        # get include dirs
        QT4_GET_MOC_FLAGS(moc_flags)
        QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN})
--- a/src/App/CMakeLists.txt
+++ b/src/App/CMakeLists.txt
@ -40,7 +40,6 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
 )

--- a/src/Base/CMakeLists.txt
+++ b/src/Base/CMakeLists.txt
@ -53,11 +53,7 @@ endif(MSVC)

 # needed for OpenSUSE
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-    set(FreeCADBase_LIBS
-        ${FreeCADBase_LIBS}
-        -lutil
-        -ldl
-    )
+    list(APPEND FreeCADBase_LIBS -lutil -ldl)
 endif()

 generate_from_xml(BaseClassPy)
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@ -67,14 +67,12 @@ IF(SPNAV_FOUND)
    include_directories(
        ${SPNAV_INCLUDE_DIR}
    )
-    set(FreeCADGui_LIBS
-        ${FreeCADGui_LIBS}
+    list(APPEND FreeCADGui_LIBS
        ${SPNAV_LIBRARIES}
    )
    find_package(X11 QUIET)
    if (X11_FOUND)
-        set(FreeCADGui_LIBS
-            ${FreeCADGui_LIBS}
+        list(APPEND FreeCADGui_LIBS
            ${X11_X11_LIB}
        )
    endif(X11_FOUND)
@ -85,8 +83,7 @@ IF(OCULUS_FOUND)
    include_directories(
        ${OCULUS_INCLUDE_DIRS}
    )
-    set(FreeCADGui_LIBS
-        ${FreeCADGui_LIBS}
+    list(APPEND FreeCADGui_LIBS
        ${OCULUS_LIBRARIES}
    )
 ENDIF(OCULUS_FOUND)
@ -96,8 +93,7 @@ if(SHIBOKEN_INCLUDE_DIR)
    include_directories(
        ${SHIBOKEN_INCLUDE_DIR}
    )
-    set(FreeCADGui_LIBS
-        ${FreeCADGui_LIBS}
+    list(APPEND FreeCADGui_LIBS
        ${SHIBOKEN_LIBRARY}
    )
 endif(SHIBOKEN_INCLUDE_DIR)
@ -109,8 +105,7 @@ if(PYSIDE_INCLUDE_DIR)
        ${PYSIDE_INCLUDE_DIR}/QtCore
        ${PYSIDE_INCLUDE_DIR}/QtGui
    )
-    set(FreeCADGui_LIBS
-        ${FreeCADGui_LIBS}
+    list(APPEND FreeCADGui_LIBS
        ${PYSIDE_LIBRARY}
    )
 endif(PYSIDE_INCLUDE_DIR)
--- a/src/Mod/Complete/Gui/CMakeLists.txt
+++ b/src/Mod/Complete/Gui/CMakeLists.txt
@ -2,7 +2,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Drawing/Gui/CMakeLists.txt
+++ b/src/Mod/Drawing/Gui/CMakeLists.txt
@ -11,7 +11,6 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
    ${PYTHON_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
    ${OCC_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@ -16,7 +16,6 @@ include_directories(
    ${COIN3D_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${OCC_INCLUDE_DIR}
-    ${QT_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${SMESH_INCLUDE_DIR}
--- a/src/Mod/Image/Gui/CMakeLists.txt
+++ b/src/Mod/Image/Gui/CMakeLists.txt
@ -9,7 +9,6 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
    ${OPENCV2_INCLUDE_DIR}
-    ${QT_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Inspection/Gui/CMakeLists.txt
+++ b/src/Mod/Inspection/Gui/CMakeLists.txt
@ -3,7 +3,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/Mesh/App/CMakeLists.txt
+++ b/src/Mod/Mesh/App/CMakeLists.txt
@ -9,7 +9,6 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
-    ${QT_QTCORE_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
    ${EIGEN3_INCLUDE_DIR}
 )
@ -17,7 +16,6 @@ include_directories(

 set(Mesh_LIBS
    ${Boost_LIBRARIES}
-    ${QT_QTCORE_LIBRARY}
    FreeCADBase
    FreeCADApp
 )
--- a/src/Mod/Mesh/Gui/CMakeLists.txt
+++ b/src/Mod/Mesh/Gui/CMakeLists.txt
@ -4,7 +4,6 @@ include_directories(
    ${COIN3D_INCLUDE_DIRS}
    ${PYTHON_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
-    ${QT_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
 )

--- a/src/Mod/MeshPart/Gui/CMakeLists.txt
+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt
@ -19,7 +19,6 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${COIN3D_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Part/Gui/CMakeLists.txt
+++ b/src/Mod/Part/Gui/CMakeLists.txt
@ -13,7 +13,6 @@ include_directories(
    ${COIN3D_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
 )
--- a/src/Mod/PartDesign/Gui/CMakeLists.txt
+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
@ -11,7 +11,6 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${COIN3D_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Path/Gui/CMakeLists.txt
+++ b/src/Mod/Path/Gui/CMakeLists.txt
@ -12,7 +12,6 @@ include_directories(
    ${COIN3D_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${OCC_INCLUDE_DIR}
-    ${QT_INCLUDE_DIR}
    ${EIGEN3_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Points/Gui/CMakeLists.txt
+++ b/src/Mod/Points/Gui/CMakeLists.txt
@ -9,7 +9,6 @@ include_directories(
    ${COIN3D_INCLUDE_DIRS}
    ${PYTHON_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
-    ${QT_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
 )

--- a/src/Mod/Raytracing/Gui/CMakeLists.txt
+++ b/src/Mod/Raytracing/Gui/CMakeLists.txt
@ -14,7 +14,6 @@ include_directories(
    ${OCC_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
-    ${QT_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
 )
 link_directories(${OCC_LIBRARY_DIR})
--- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
@ -11,7 +11,6 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${COIN3D_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Robot/Gui/CMakeLists.txt
+++ b/src/Mod/Robot/Gui/CMakeLists.txt
@ -14,7 +14,6 @@ include_directories(
    ${COIN3D_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${OCC_INCLUDE_DIR}
-    ${QT_INCLUDE_DIR}
    ${EIGEN3_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Sketcher/Gui/CMakeLists.txt
+++ b/src/Mod/Sketcher/Gui/CMakeLists.txt
@ -14,7 +14,6 @@ include_directories(
    ${COIN3D_INCLUDE_DIRS}
    ${PYTHON_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
-    ${QT_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
    ${EIGEN3_INCLUDE_DIR}
 )
--- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt
@ -3,9 +3,7 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
-    ${SOQT_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
 )
--- a/src/Mod/Start/Gui/CMakeLists.txt
+++ b/src/Mod/Start/Gui/CMakeLists.txt
@ -2,7 +2,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/TechDraw/Gui/CMakeLists.txt
+++ b/src/Mod/TechDraw/Gui/CMakeLists.txt
@ -11,8 +11,6 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
    ${PYTHON_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
-    ${QT_USE_QTXML}
    ${OCC_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Test/Gui/CMakeLists.txt
+++ b/src/Mod/Test/Gui/CMakeLists.txt
@ -1,7 +1,6 @@
 include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
-    ${QT_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
 )
--- a/src/Mod/Web/App/CMakeLists.txt
+++ b/src/Mod/Web/App/CMakeLists.txt
@ -6,7 +6,6 @@ include_directories(
    ${PYTHON_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
 )

 set(Web_LIBS
--- a/src/Mod/Web/Gui/CMakeLists.txt
+++ b/src/Mod/Web/Gui/CMakeLists.txt
@ -2,7 +2,6 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
-    ${QT_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
    ${PYTHON_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}