diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-25 12:54:33 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-28 11:37:11 +0200 |
commit | 2b134d46c21c86dd1cf66ba5e9c961714d73b3b3 (patch) | |
tree | d4908ae8d78a228ad161e1237a1b0b5d3c5d98af /setup.py | |
parent | 84597fa46a6c0134cef514f749c3f072bfe6fe14 (diff) | |
parent | 117e0ff91275b4bc06dd5383f19e7028c5ef6ff8 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I073b05f8b39c0af32aa57ce3589c1aac2d712213
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 13 |
1 files changed, 0 insertions, 13 deletions
@@ -820,7 +820,6 @@ class pyside_build(_build): cmake_cmd = [ OPTION_CMAKE, "-G", self.make_generator, - "-DQT_QMAKE_EXECUTABLE='%s'" % self.qtinfo.qmake_command, "-DBUILD_TESTS=%s" % self.build_tests, "-DQt5Help_DIR=%s" % self.qtinfo.docs_dir, "-DCMAKE_BUILD_TYPE=%s" % self.build_type, @@ -842,18 +841,6 @@ class pyside_build(_build): cmake_cmd.append("-DUSE_PYTHON_VERSION=3.3") if sys.platform == 'darwin': - # Shiboken supports specifying multiple include paths separated by a colon on *nix - # systems. - # In a framework build, two paths should be included: - # path_to_qt/lib -> which contains framework folders with headers, and - # path_to_qt/include -> which contains headers for static libraries. - # A non-framework build contains all headers in the path_to_qt/include folder. - path_separator = ":" - includes_dir = '-DALTERNATIVE_QT_INCLUDE_DIR=' + self.qtinfo.headers_dir - if os.path.isdir(self.qtinfo.headers_dir + "/../lib/QtCore.framework"): - includes_dir += path_separator + self.qtinfo.headers_dir + "/../lib/" - cmake_cmd.append(includes_dir) - if OPTION_OSXARCH: # also tell cmake which architecture to use cmake_cmd.append("-DCMAKE_OSX_ARCHITECTURES:STRING={}".format(OPTION_OSXARCH)) |