Commit Graph

16 Commits

Author SHA1 Message Date
Peter Lama
cab061ba56 Add Qt Assistant to mac app 2018-03-30 11:25:42 +02:00
Peter Lama
6c8e104031 Handle webkit being in a non-standard location on macOS 2018-03-25 11:56:28 +02:00
Peter Lama
c0ad3fec63 Fix macOS Qt4 build
- Dereference qt plugin symlinks
- Remove qt postgresql plugin because of missing dependency
2017-08-28 11:47:44 -03:00
Chris Johnson
ccbc0c68f6 Fix for CMake failure from empty Homebrew Python site-packages
CMake Error at src/MacAppBundle/CMakeLists.txt:25 (string):
      string sub-command STRIP requires two arguments.
2017-05-27 20:34:19 -03:00
Bruce B. Lacey
d964187504 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
2017-03-01 09:33:28 +01:00
Bruce B. Lacey
5084b96759 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"
2017-02-27 10:30:36 +01:00
Bruce B. Lacey
7f884e8bff Qt5: cmake install dependencies on macOS
* Define QT_PLUGINS_DIR when building Qt5 on macOS
   * Add Xcode XCTest search path
2017-02-24 14:38:43 +01:00
Bruce B. Lacey
21080af2a7 Packaging: macOS relocation of libraries without children
* macOS install path must be <bundle>/MacOS in order for
    QLibrary to find qt.conf to set the correct bundle paths
  * Refactored to add an explicit graph traversal to set the
    dynamic loader id to handle the case where a bundled
    resource does not have any children
  * Fixed the case where rpaths were not removed from
    libraries without children
  * Improved diagnostics when bundling fail to finds
    a dependent library in the search path

Mantis: #0002886
Refs: #535
2017-02-23 20:28:17 -08:00
Bruce B. Lacey
0f2943bde5 Added osx freecad-doc.icns icon resource file. 2016-03-20 19:51:24 -07:00
Bruce B. Lacey
4ac1e89b65 Add high-resolution variant of FreeCAD document icon resources for all platforms
We did not have document icons defined for OS X and the existing legacy
icons were low resolution.  For this change, we have created a
freecad-doc.svg icon that serves as the basis for generating
platform-specific FreeCAD document icon sets for the supported
platforms.  Extended the OS X bundle definition to include the
high-resolution document icon set and regenerated the existing 64x64
Gui/Icon/freecad-doc.png from the new svg variant.
2016-03-19 19:10:13 -07:00
Bruce B. Lacey
b18a5f1396 Improved Mac OS X Application Packaging.
1.  Set python dependency paths in Application Bundle adhering the Homebrew convention of installing them in prefix/libexec
   2.  Add appdmg configuration to produce an os x disk image for FreeCAD application distribution
   3.  Added a Tools convenience script to produce an archive name from a serialized Version.h file using the convention FreeCAD_{Major Version Number}.{Minor Version Number}-{Git Revision Count}.{Git Short SHA}-{OS}-{Arch}
2016-03-07 20:49:58 -08:00
Bruce Lacey
ee8ac77eab Added High Resolution Display icons to Mac OS X iconset resource file (.icns). 2016-02-28 14:39:31 -08:00
Yorik van Havre
26639f1eca Updated Mac icon with the new style 2016-02-27 15:49:36 -03:00
wmayer
76c238fc98 + fixes #0001860: Can not open a FreeCAD project in FreeCAD by double-clicking the project file on Macintosh 2015-11-29 15:36:47 +01:00
Ian Rees
ccfaa56b31 Improves build on MacOS with Homebrew or MacPorts
Squashed commit of the following:

commit e158a2049b922cead90cee4a9d3814093db8d00d
Merge: e7c5c06 d545f5b
Author: Ian Rees <ian.rees@gmail.com>
Date:   Wed Mar 25 17:08:56 2015 +1300

    Merge branch 'mac-app-bundle' into macports-build-1

commit d545f5b0de0efa6a0fd020ac98bb6809d9254019
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Mar 19 22:30:20 2015 +1300

    Minor fixes to Mac application bundle creation

commit e7c5c0630b47e89fc719259f3d81be724627f915
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Mar 19 16:35:34 2015 +1300

    Report error if no OpenCasCADe found

commit 976b51c13a1619acf66b9d4fad5594fee292aa76
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Mar 19 16:30:47 2015 +1300

    Detects OCE automatically on Homebrew and MacPorts

commit 1cc477f77f388f2ccb26f3884320819f8cb33249
Author: Ian Rees <ian.rees@gmail.com>
Date:   Tue Mar 17 15:00:34 2015 +1300

    Find PySide and Shiboken automagically on MacPorts

commit 8bf2ebf7397a1c8c4b1b6f1d97e303f335ab47d7
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Mar 16 23:05:35 2015 +1300

    Finds the Python include dir and library on OSX

commit 8bba9b2c78cfe65d7c295c4c99f0a176e1281539
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Mar 16 17:31:43 2015 +1300

    Detects Python executable in MacPorts or Homebrew

commit 349a2e0e5c4d370c331bdb54d80d8f4323db8a6b
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Mar 16 08:25:16 2015 +1300

    Missing correct Python lib is error on cmake-ing

commit 1625fe7c1c7fb2d944b04d93be8cf90d5c829be9
Author: Ian Rees <ian.rees@gmail.com>
Date:   Sun Mar 15 21:06:08 2015 +1300

    Find PySide's UIC and RCC tools properly on MacPorts
2015-04-01 14:40:34 +02:00
Peter Lama
119d55be4c Integrate script for making a relocatable OS X app 2015-02-22 18:23:10 +01:00