[Marble-commits] KDE/kdeedu

[Simon Edwards]

SVN commit 1196935 by sedwards:

Removed references to PyKDE because the Marble Python bindings don't actually need PyKDE itself and compile fine without it.


 M  +7 -3      CMakeLists.txt  
 M  +3 -9      marble/src/bindings/python/CMakeLists.txt  


--- trunk/KDE/kdeedu/CMakeLists.txt #1196934:1196935
@@ -42,10 +42,14 @@
     endif(PYQT4_FOUND AND PYQT4_VERSION STRLESS "040400")
     macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by marble python plugins to run. " "http://www.riverbankcomputing.co.uk/software/pyqt/intro" FALSE)
 
-    macro_optional_find_package(PyKDE4)
-    if (PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
+#    macro_optional_find_package(PyKDE4)
+#    if (PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
+#      set(PythonSupport_FOUND TRUE)
+#    endif (PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
+
+    if (PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND)
       set(PythonSupport_FOUND TRUE)
-    endif (PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
+    endif (PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND)
 
     macro_log_feature(PythonSupport_FOUND "Python" "KDE Python support"
       "http://techbase.kde.org/Development/Languages/Python" FALSE ""
--- trunk/KDE/kdeedu/marble/src/bindings/python/CMakeLists.txt #1196934:1196935
@@ -4,17 +4,14 @@
 # compile SIP
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  ${SIP_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH}
     # Qt
-    ${KDE4_INCLUDES} ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTNETWORK_INCLUDE_DIR} ${QT_QTSQL_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTSVG_INCLUDE_DIR} ${QT_QTUITOOLS_INCLUDE_DIR}
-    # ${QT_QTOPENGL_INCLUDE_DIR} 
-    # KDE
-    ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${KDE4_INCLUDE_DIR}/solid ${KDE4_INCLUDE_DIR}/kio ${KDE4_INCLUDE_DIR}/kdeprint ${KDE4_INCLUDE_DIR}/kdeprint/lpr ${KDE4_INCLUDE_DIR}/dom ${KDE4_INCLUDE_DIR}/ksettings
+    ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTNETWORK_INCLUDE_DIR} ${QT_QTSQL_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTSVG_INCLUDE_DIR} ${QT_QTUITOOLS_INCLUDE_DIR}
     # Marble included
     ../../../lib
 )
 
-set(SIP_INCLUDES ${PYQT4_SIP_DIR} ${PYKDE4_SIP_DIR} sip)
+set(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
 set(SIP_CONCAT_PARTS 8)
-set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG} )#${PYKDE4_VERSION_TAG})
+set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG} )
 set(SIP_EXTRA_OPTIONS -g)
 FILE(GLOB extra_files_sip sip/*.sip)
 set(SIP_EXTRA_FILES_DEPEND ${extra_files_sip})
@@ -26,6 +23,3 @@
     ${QT_QTUITOOLS_LIBRARY}
     ${QT_QTWEBKIT_LIBRARY}
 )
-#    ${KDE4_KIO_LIBRARY}
-#    ${KDE4_KDECORE_LIBRARY}
-#    ${KDE4_KDEUI_LIBRARY}