From 6f49a93f59b930be858cd1cc9174de74f38ff393 Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Fri, 18 Oct 2013 08:03:21 +0200 Subject: use the headers info that can be found in "qmake -query". Since Qt has a headers variable, there is no reason for a work-around. --- setup.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a8ac82e95..2e8abc5f1 100644 --- a/setup.py +++ b/setup.py @@ -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 -- cgit v1.2.3