diff options
-rw-r--r-- | pyside_postinstall.py | 3 | ||||
-rw-r--r-- | qtinfo.py | 4 | ||||
-rw-r--r-- | setup.py | 11 |
3 files changed, 8 insertions, 10 deletions
diff --git a/pyside_postinstall.py b/pyside_postinstall.py index ec8146aba..a10aef789 100644 --- a/pyside_postinstall.py +++ b/pyside_postinstall.py @@ -78,6 +78,9 @@ def back_tick(cmd, ret_err=False): """
proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=True)
out, err = proc.communicate()
+ if not isinstance(out, str):
+ # python 3
+ out = out.decode()
retcode = proc.returncode
if retcode is None:
proc.terminate()
@@ -30,6 +30,9 @@ class QtInfo(object): def getTranslationsPath(self): return self.getProperty("QT_INSTALL_TRANSLATIONS") + def getHeadersPath(self): + return self.getProperty("QT_INSTALL_HEADERS") + def getProperty(self, prop_name): cmd = [self._qmake_path, "-query", prop_name] proc = subprocess.Popen(cmd, stdout = subprocess.PIPE, shell=False) @@ -48,3 +51,4 @@ class QtInfo(object): qmake_path = property(getQMakePath) imports_dir = property(getImportsPath) translations_dir = property(getTranslationsPath) + headers_dir = property(getHeadersPath) @@ -580,16 +580,7 @@ class pyside_build(_build): cmake_cmd.append("-DUSE_PYTHON3=ON") if sys.platform == 'darwin': - if 'QTDIR' in os.environ: - # If the user has QTDIR set, then use it as a prefix for an extra include path - cmake_cmd.append('-DALTERNATIVE_QT_INCLUDE_DIR={0}/include'.format(os.environ['QTDIR'])) - #:{0}/lib I had problems specifying both dirs. Is it needed? Is there some other way to do it? --Robin - else: - # Otherwise assume it is a standard install and add the - # Frameworks folder as a workaround for a cmake include problem - # http://neilweisenfeld.com/wp/120/building-pyside-on-the-mac - # https://groups.google.com/forum/#!msg/pyside/xciZZ4Hm2j8/CUmqfJptOwoJ - cmake_cmd.append('-DALTERNATIVE_QT_INCLUDE_DIR=/Library/Frameworks') + cmake_cmd.append('-DALTERNATIVE_QT_INCLUDE_DIR=' + self.qtinfo.headers_dir) if OPTION_OSXARCH: # also tell cmake which architecture to use |