Overview

File pyside-old_cmake_versions.patch of Package python-pyside

Index: data/typesystem/CMakeLists.txt
===================================================================
--- data/typesystem/CMakeLists.txt.orig
+++ data/typesystem/CMakeLists.txt
@@ -1,10 +1,14 @@
 project(typesystem)
 
-if ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} GREATER 5))
-    set(PYSIDE_QT_VERSION "46")
-else ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} GREATER 5))
+if (${QT_VERSION_MAJOR} EQUAL 4)
+    if (${QT_VERSION_MINOR} GREATER 5)
+        set(PYSIDE_QT_VERSION "46")
+    else (${QT_VERSION_MINOR} GREATER 5)
+      set(PYSIDE_QT_VERSION "40")
+    endif (${QT_VERSION_MINOR} GREATER 5)
+else (${QT_VERSION_MAJOR} EQUAL 4)
     set(PYSIDE_QT_VERSION "40")
-endif ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} GREATER 5))
+endif (${QT_VERSION_MAJOR} EQUAL 4)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/typesystem_core.xml.in
                ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_core.xml @ONLY)
Index: PySide/QtCore/CMakeLists.txt
===================================================================
--- PySide/QtCore/CMakeLists.txt.orig
+++ PySide/QtCore/CMakeLists.txt
@@ -1,31 +1,35 @@
 project(QtCore)
 
-if ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
+if (NOT ${QT_VERSION_MAJOR} EQUAL 4)
+    if (NOT ${QT_VERSION_MINOR} LESS 6)
+      set(QtCore_46_SRC
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qeasingcurve_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qabstractanimation_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qabstractstate_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qabstracttransition_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qanimationgroup_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qeventtransition_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qfinalstate_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qhistorystate_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qmargins_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qparallelanimationgroup_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qpauseanimation_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qprocessenvironment_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qpropertyanimation_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qsequentialanimationgroup_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qsignaltransition_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qstate_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qstatemachine_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qstatemachine_signalevent_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qstatemachine_wrappedevent_wrapper.cpp
+      ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qvariantanimation_wrapper.cpp
+      )
+    else (NOT ${QT_VERSION_MINOR} LESS 6)
+      set (QtCore_46_SRC )
+    endif (NOT ${QT_VERSION_MINOR} LESS 6)
+else (NOT ${QT_VERSION_MAJOR} EQUAL 4)
     set (QtCore_46_SRC )
-else ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
-    set(QtCore_46_SRC
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qeasingcurve_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qabstractanimation_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qabstractstate_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qabstracttransition_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qanimationgroup_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qeventtransition_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qfinalstate_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qhistorystate_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qmargins_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qparallelanimationgroup_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qpauseanimation_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qprocessenvironment_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qpropertyanimation_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qsequentialanimationgroup_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qsignaltransition_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qstate_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qstatemachine_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qstatemachine_signalevent_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qstatemachine_wrappedevent_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qvariantanimation_wrapper.cpp
-    )
-endif ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
+endif (NOT ${QT_VERSION_MAJOR} EQUAL 4)
 
 
 set(QtCore_SRC
Index: PySide/QtGui/CMakeLists.txt
===================================================================
--- PySide/QtGui/CMakeLists.txt.orig
+++ PySide/QtGui/CMakeLists.txt
@@ -17,9 +17,8 @@ ELSE(Q_WS_MAC)
     MESSAGE(FATAL_ERROR "OS not supported")
 ENDIF(Q_WS_X11)
 
-if ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
-    set (QtGui_46_SRC )
-else ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
+if (NOT ${QT_VERSION_MAJOR} EQUAL 4)
+  if (NOT ${QT_VERSION_MINOR} LESS 6)
     set(QtGui_46_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtGui/qmatrix2x2_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtGui/qmatrix2x2_wrapper.hpp
@@ -90,7 +89,12 @@ else ((${QT_VERSION_MAJOR} EQUAL 4) AND
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtGui/qvector4d_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtGui/qvector4d_wrapper.hpp
     )
-endif ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
+  else (NOT ${QT_VERSION_MINOR} LESS 6)
+    set (QtGui_46_SRC )
+  endif (NOT ${QT_VERSION_MINOR} LESS 6)
+else (NOT ${QT_VERSION_MAJOR} EQUAL 4)
+    set (QtGui_46_SRC )
+endif (NOT ${QT_VERSION_MAJOR} EQUAL 4)
 
 set(QtGui_SRC
 ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtGui/converter_register_qtgui.hpp
Index: PySide/QtOpenGL/CMakeLists.txt
===================================================================
--- PySide/QtOpenGL/CMakeLists.txt.orig
+++ PySide/QtOpenGL/CMakeLists.txt
@@ -1,14 +1,19 @@
 project(QtOpenGL)
 
-if ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
-  set(QtOpenGL_46_SRC )
-else ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
-  set(QtOpenGL_46_SRC
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtOpenGL/qglframebufferobjectformat_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtOpenGL/qglshader_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtOpenGL/qglshaderprogram_wrapper.cpp
-  )
-endif ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
+if (NOT ${QT_VERSION_MAJOR} EQUAL 4)
+    if (NOT ${QT_VERSION_MINOR} LESS 6)
+        set(QtOpenGL_46_SRC
+          ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtOpenGL/qglframebufferobjectformat_wrapper.cpp
+          ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtOpenGL/qglshader_wrapper.cpp
+          ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtOpenGL/qglshaderprogram_wrapper.cpp
+        )
+    else (NOT ${QT_VERSION_MINOR} LESS 6)
+      set(QtOpenGL_46_SRC )
+    endif (NOT ${QT_VERSION_MINOR} LESS 6)
+else (NOT ${QT_VERSION_MAJOR} EQUAL 4)
+    set(QtOpenGL_46_SRC )
+endif (NOT ${QT_VERSION_MAJOR} EQUAL 4)
+
 
 set(QtOpenGL_SRC
 ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtOpenGL/qgl_wrapper.cpp
Index: PySide/QtWebKit/CMakeLists.txt
===================================================================
--- PySide/QtWebKit/CMakeLists.txt.orig
+++ PySide/QtWebKit/CMakeLists.txt
@@ -1,18 +1,22 @@
 project(QtWebKit)
 
-if ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
+if (NOT ${QT_VERSION_MAJOR} EQUAL 4)
+    if (NOT ${QT_VERSION_MINOR} LESS 6)
+        set(QtWebKit_46_SRC
+        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebelement_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebelementcollection_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebinspector_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebpage_extensionoption_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebpage_extensionreturn_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebpage_errorpageextensionoption_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebpage_errorpageextensionreturn_wrapper.cpp
+        )
+    else (NOT ${QT_VERSION_MINOR} LESS 6)
+      set(QtWebKit_46_SRC )
+    endif (NOT ${QT_VERSION_MINOR} LESS 6)
+else (NOT ${QT_VERSION_MAJOR} EQUAL 4)
     set(QtWebKit_46_SRC )
-else ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
-    set(QtWebKit_46_SRC
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebelement_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebelementcollection_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebinspector_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebpage_extensionoption_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebpage_extensionreturn_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebpage_errorpageextensionoption_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtWebKit/qwebpage_errorpageextensionreturn_wrapper.cpp
-    )
-endif ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
+endif (NOT ${QT_VERSION_MAJOR} EQUAL 4)
 
 
 set(QtWebKit_SRC
Index: PySide/QtXmlPatterns/CMakeLists.txt
===================================================================
--- PySide/QtXmlPatterns/CMakeLists.txt.orig
+++ PySide/QtXmlPatterns/CMakeLists.txt
@@ -1,13 +1,18 @@
 project(QtXml)
 
-if ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
-  set(QtXmlPatterns_46_SRC )
-else ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
-  set(QtXmlPatterns_46_SRC
-  ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtXmlPatterns/qxmlschema_wrapper.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtXmlPatterns/qxmlschemavalidator_wrapper.cpp
-  )
-endif ((${QT_VERSION_MAJOR} EQUAL 4) AND (${QT_VERSION_MINOR} LESS 6))
+if (NOT ${QT_VERSION_MAJOR} EQUAL 4)
+    if (NOT ${QT_VERSION_MINOR} LESS 6)
+        set(QtXmlPatterns_46_SRC
+        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtXmlPatterns/qxmlschema_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtXmlPatterns/qxmlschemavalidator_wrapper.cpp
+        )
+    else (NOT ${QT_VERSION_MINOR} LESS 6)
+        set(QtXmlPatterns_46_SRC )
+    endif (NOT ${QT_VERSION_MINOR} LESS 6)
+else (NOT ${QT_VERSION_MAJOR} EQUAL 4)
+    set(QtXmlPatterns_46_SRC )
+endif (NOT ${QT_VERSION_MAJOR} EQUAL 4)
+
 
 set(QtXmlPatterns_SRC
 ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtXmlPatterns/qabstractmessagehandler_wrapper.cpp
openSUSE Build Service is sponsored by
Places