From 166fc624ebadd56aa0890c2d79d5450ca4c4d9e8 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 13 Dec 2016 15:40:49 +0100 Subject: [PATCH] remove superfluous Qt includes --- CMakeLists.txt | 3 ++- src/App/CMakeLists.txt | 1 - src/Base/CMakeLists.txt | 6 +----- src/Gui/CMakeLists.txt | 15 +++++---------- src/Mod/Complete/Gui/CMakeLists.txt | 1 - src/Mod/Drawing/Gui/CMakeLists.txt | 1 - src/Mod/Fem/Gui/CMakeLists.txt | 1 - src/Mod/Image/Gui/CMakeLists.txt | 1 - src/Mod/Inspection/Gui/CMakeLists.txt | 1 - src/Mod/Mesh/App/CMakeLists.txt | 2 -- src/Mod/Mesh/Gui/CMakeLists.txt | 1 - src/Mod/MeshPart/Gui/CMakeLists.txt | 1 - src/Mod/Part/Gui/CMakeLists.txt | 1 - src/Mod/PartDesign/Gui/CMakeLists.txt | 1 - src/Mod/Path/Gui/CMakeLists.txt | 1 - src/Mod/Points/Gui/CMakeLists.txt | 1 - src/Mod/Raytracing/Gui/CMakeLists.txt | 1 - src/Mod/ReverseEngineering/Gui/CMakeLists.txt | 1 - src/Mod/Robot/Gui/CMakeLists.txt | 1 - src/Mod/Sketcher/Gui/CMakeLists.txt | 1 - src/Mod/Spreadsheet/Gui/CMakeLists.txt | 2 -- src/Mod/Start/Gui/CMakeLists.txt | 1 - src/Mod/TechDraw/Gui/CMakeLists.txt | 2 -- src/Mod/Test/Gui/CMakeLists.txt | 1 - src/Mod/Web/App/CMakeLists.txt | 1 - src/Mod/Web/Gui/CMakeLists.txt | 1 - 26 files changed, 8 insertions(+), 42 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48d654823..1624f3300 100644 --- 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}) diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt index 8c4247e5e..c1905a7e6 100644 --- 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} ) diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt index 4254b13cc..85ac936e0 100644 --- 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) diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index 305774c8a..28a50c31c 100644 --- 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) diff --git a/src/Mod/Complete/Gui/CMakeLists.txt b/src/Mod/Complete/Gui/CMakeLists.txt index 9b5a3e534..185f2a794 100644 --- 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} diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt index 33423d5d1..c13e06efb 100644 --- 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} diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 6c4dc2641..c42ea4cee 100755 --- 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} diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt index f2bf148dd..148eb2fde 100644 --- 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} diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt index 940f89081..52d47720b 100644 --- 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} diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt index cc3d4d4ff..8de9f92c0 100644 --- 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 ) diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 3796e9663..19cc27da0 100644 --- 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} ) diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt index 19a33373a..0a69e2337 100644 --- 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} diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt index 62c592098..96f7f0966 100644 --- 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} ) diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt index 46506f28f..e8532b9fa 100644 --- 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} diff --git a/src/Mod/Path/Gui/CMakeLists.txt b/src/Mod/Path/Gui/CMakeLists.txt index a20a450df..f89fd08ac 100644 --- 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} diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt index a4936c9e1..242897b07 100644 --- 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} ) diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt index 308f3dcc7..bda3a5b75 100644 --- 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}) diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt index 42e84db9c..0d268cfa6 100644 --- 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} diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt index 24e9c2497..887d39c22 100644 --- 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} diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt index 7e0b0f6a9..e5618bb51 100644 --- 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} ) diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt index 4e86da3e5..5689103a5 100644 --- 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} ) diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt index 68f318639..9c9efa473 100644 --- 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} diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt index 70abd4d34..65c343a86 100644 --- 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} diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt index 8c274cedf..9e3133a3c 100644 --- 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} ) diff --git a/src/Mod/Web/App/CMakeLists.txt b/src/Mod/Web/App/CMakeLists.txt index d69ab023f..54194d17e 100644 --- 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 diff --git a/src/Mod/Web/Gui/CMakeLists.txt b/src/Mod/Web/Gui/CMakeLists.txt index 8a4b7d7cd..5d63ade9c 100644 --- 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}