diff options
author | Christian Tismer <tismer@stackless.com> | 2016-01-21 00:03:08 +0100 |
---|---|---|
committer | Christian Tismer <tismer@stackless.com> | 2016-01-21 00:03:08 +0100 |
commit | b990d231810eb329d837356271a719e58a6e004d (patch) | |
tree | cc9e09413fe492e61dc5aefa88911098eedcb170 | |
parent | 5723ad8e24c6742e1a35707f5fa7dc59062c6df4 (diff) | |
parent | 124444ccadab3f4a57b348653bd204da3b30a90a (diff) |
Merge pull request #19 from PySide/shiboken2-cmake-testing-patch
Updating setup.py for fixes and additions in shiboken2
-rw-r--r-- | setup.py | 20 |
1 files changed, 6 insertions, 14 deletions
@@ -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) |