Qt5: build FreeCAD for macOS with both Qt5 and Qt4

* Extend Travis config to build and deploy FreeCAD on
     macOS with Qt5, in addition to Qt4
   * Link PySide wrapper to <bundle>/MacOS
   * Warn on install_name_tool failures (work-around to
     confirmed Apple install_name_tool bug)
   * Reference XCTest "Current" framework versus "A"
This commit is contained in:
Bruce B. Lacey
2017-02-25 18:36:27 -08:00
committed by wmayer
parent 1255ac62c2
commit 5084b96759
4 changed files with 55 additions and 17 deletions

View File

@@ -47,7 +47,7 @@ if(BUILD_QT5)
)
string(STRIP ${XCODE_PATH} XCODE_PATH)
set(XCTEST_PATH "${XCODE_PATH}/Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework/Versions/A")
set(XCTEST_PATH "${XCODE_PATH}/Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework/Versions/Current")
endif(BUILD_QT5)
install(DIRECTORY ${QT_PLUGINS_DIR}/ DESTINATION ${CMAKE_INSTALL_LIBDIR}/qtplugins )

View File

@@ -0,0 +1 @@
../bin/PySide

View File

@@ -339,7 +339,10 @@ def change_libid(graph, node, bundle_path):
if in_bundle(lib, bundle_path):
logging.debug(" ~ id: " + node.name)
check_call([ "install_name_tool", "-id", node.name, lib ])
try:
check_call([ "install_name_tool", "-id", node.name, lib ])
except:
logging.warning("Failed to change bundle id {} in lib {}".format(node.name, lib))
def print_child(graph, node, path):
logging.debug(" >" + str(node))
@@ -363,7 +366,7 @@ def main():
#change to level to logging.DEBUG for diagnostic messages
logging.basicConfig(stream=sys.stdout, level=logging.INFO,
format="-- %(message)s" )
format="-- %(levelname)s: %(message)s" )
logging.info("Analyzing bundle dependencies...")
build_deps_graph(graph, bundle_path, dir_filter, search_paths)