Updating setup.py for fixes and additions in shiboken2

This is for testing an commit for shiboken2. The changes here might be incomplete.

1 files changed, 6 insertions, 14 deletions

diff --git a/setup.py b/setup.py
index 52cd56bda..0d5a320bb 100644
--- a/setup.py
+++ b/setup.py
@@ -610,24 +610,16 @@ class pyside_build(_build):
             "-DCMAKE_INSTALL_PREFIX=%s" % self.install_dir,
             module_src_dir
         ]
-        if sys.version_info[0] > 2:
-            cmake_cmd.append("-DPYTHON3_EXECUTABLE=%s" % self.py_executable)
-            cmake_cmd.append("-DPYTHON3_INCLUDE_DIR=%s" % self.py_include_dir)
-            cmake_cmd.append("-DPYTHON3_LIBRARY=%s" % self.py_library)
-            if self.build_type.lower() == 'debug':
-                cmake_cmd.append("-DPYTHON3_DBG_EXECUTABLE=%s" % self.py_executable)
-                cmake_cmd.append("-DPYTHON3_DEBUG_LIBRARY=%s" % self.py_library)
-        else:
-            cmake_cmd.append("-DPYTHON_EXECUTABLE=%s" % self.py_executable)
-            cmake_cmd.append("-DPYTHON_INCLUDE_DIR=%s" % self.py_include_dir)
-            cmake_cmd.append("-DPYTHON_LIBRARY=%s" % self.py_library)
-            if self.build_type.lower() == 'debug':
-                cmake_cmd.append("-DPYTHON_DEBUG_LIBRARY=%s" % self.py_library)
+        cmake_cmd.append("-DPYTHON_EXECUTABLE=%s" % self.py_executable)
+        cmake_cmd.append("-DPYTHON_INCLUDE_DIR=%s" % self.py_include_dir)
+        cmake_cmd.append("-DPYTHON_LIBRARY=%s" % self.py_library)
+        if self.build_type.lower() == 'debug':
+            cmake_cmd.append("-DPYTHON_DEBUG_LIBRARY=%s" % self.py_library)
 
         if extension.lower() == "shiboken2":
             cmake_cmd.append("-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=yes")
             if sys.version_info[0] > 2:
-                cmake_cmd.append("-DUSE_PYTHON3=ON")
+                cmake_cmd.append("-DUSE_PYTHON_VERSION=3.4")
 
         if sys.platform == 'darwin':
             cmake_cmd.append('-DALTERNATIVE_QT_INCLUDE_DIR=' + self.qtinfo.headers_dir)