Install macOS bundle executables into MacOS
* Previously, the macOS bundle executables were installed into
bin which does not adhere to Apple guidelines and causes
issues with certain frameworks like Qt. The install has
been refactored to install the executables into MacOS
Fixes #2928
This commit is contained in:
@@ -1 +0,0 @@
|
||||
../bin/PySide
|
||||
@@ -1 +0,0 @@
|
||||
../MacOS/FreeCAD
|
||||
@@ -94,11 +94,16 @@ if(WIN32)
|
||||
RUNTIME DESTINATION bin
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
)
|
||||
else(WIN32)
|
||||
elseif(APPLE)
|
||||
INSTALL(TARGETS FreeCADMainCmd
|
||||
RUNTIME DESTINATION MacOS
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
)
|
||||
else()
|
||||
INSTALL(TARGETS FreeCADMainCmd
|
||||
RUNTIME DESTINATION bin
|
||||
)
|
||||
endif(WIN32)
|
||||
endif()
|
||||
|
||||
######################## FreeCADMainPy ########################
|
||||
|
||||
|
||||
@@ -359,7 +359,7 @@ def main():
|
||||
path = sys.argv[1]
|
||||
bundle_path = os.path.abspath(os.path.join(path, "Contents"))
|
||||
graph = DepsGraph()
|
||||
dir_filter = ["bin", "lib", "Mod", "Mod/PartDesign",
|
||||
dir_filter = ["MacOS", "lib", "Mod",
|
||||
"lib/python2.7/site-packages",
|
||||
"lib/python2.7/lib-dynload"]
|
||||
search_paths = [bundle_path + "/lib"] + sys.argv[2:]
|
||||
|
||||
Reference in New Issue
Block a user