Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix OSX compile and deploy #304

Closed
wants to merge 1 commit into from

Conversation

romibi
Copy link
Contributor

@romibi romibi commented Sep 1, 2017

  • Set additional stdlib compile flag
    I get compile errors otherwise, at least locally.
  • Fix FindLdap.cmake for OSX
    I hope the way I did it is ok. But I know it can be improved!
  • Use older OSX image on travis.
    I don't want to upgrade my old MacBook to an newer OSX version … and with the few pushs to update the scripts for newer xcode to build on travis I didn't get deploy to work, yet.
    I might give this a try later again … maybe even with a new macbook …
  • Fix DMG creation
    hdiutil sometimes fails if no volume size is provided.
    Fixed by taking the size of the contents (and slightly increasing it to be safe)
  • cleaned up travis.yml a bit

New since 2017-12-23:

  • Stop manually overriding CMAKE_OSX_SYSROOT
    This was the main reason why it broke if compiled on a different OSX version.
    CMake should have this variable correctly set already!
  • (modified Fix for FindLdap.cmake)

Things which still can be improved:
To support KF5 stuff being deployed the deploy script needs to be modified to also rewrite absolute paths to relative paths in the linking inside ".dylib" packages in addition to ".framework" packages.
This can be done in a later PR but until that is done we can ship KF5 stuff with the OSX app.
(At least not automatically.)

@romibi
Copy link
Contributor Author

romibi commented Dec 22, 2017

doesn't work anymore …
mainly because of the older OSX image?
Edit: fixed

Set additional compile flag
Fix FindLdap.cmake for OSX
Fix DMG creation (sometimes fails if no volume size is provided)
@Sput42 Sput42 closed this in 8a7444f Feb 4, 2018
@romibi romibi deleted the fix-travis-osx-deploy branch February 5, 2018 15:51
Sput42 pushed a commit that referenced this pull request Feb 28, 2018
Set additional compile flag
Fix DMG creation (sometimes fails if no volume size is provided)

Closes GH-304.

(cherry picked from commit 8a7444f)

Conflicts:
    .travis.yml
    cmake/FindLdap.cmake
Sput42 pushed a commit that referenced this pull request Apr 4, 2018
Set additional compile flag
Fix DMG creation (sometimes fails if no volume size is provided)

Closes GH-304.

(cherry picked from commit 8a7444f)

Conflicts:
    .travis.yml
    cmake/FindLdap.cmake
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant