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

fixes to build using cmake on macOS/Qt5 #834

Merged
merged 8 commits into from
Aug 12, 2022
Merged

fixes to build using cmake on macOS/Qt5 #834

merged 8 commits into from
Aug 12, 2022

Conversation

devernay
Copy link
Member

@devernay devernay commented Aug 8, 2022

Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. Additionally, make sure you've done all of these things:

PR Description

What type of PR is this? (Check one of the boxes below)

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Improvement (non-breaking change which does not add functionality nor fixes a bug but improves Natron in some way)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • My change requires a change to the documentation
    • I have updated the documentation accordingly

What does this pull request do?

Add support for building using cmake on macOS / homebrew.

Building on macOS / MacPorts will be more complex as it requires modifying MacPorts's pyside install, which doesn't include cmake or pkg-config files.

HostSupport/CMakeLists.txt Outdated Show resolved Hide resolved
Copy link
Member

@YakoYakoYokuYoku YakoYakoYokuYoku left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise LGTM.

Engine/CMakeLists.txt Show resolved Hide resolved
Gui/CMakeLists.txt Show resolved Hide resolved
HostSupport/CMakeLists.txt Outdated Show resolved Hide resolved
INSTALL_MACOS.md Show resolved Hide resolved
libs/ceres/ceres-Natron.patch Outdated Show resolved Hide resolved
libs/glog/glog-Natron.patch Outdated Show resolved Hide resolved
HostSupport/CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
libs/ceres/ceres-Natron.patch Outdated Show resolved Hide resolved
libs/glog/glog-Natron.patch Outdated Show resolved Hide resolved
devernay and others added 3 commits August 12, 2022 13:18
Copy link
Member

@YakoYakoYokuYoku YakoYakoYokuYoku left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only things that remain are those requested changes and I'd squash the commits of this PR into one or two.

App/CMakeLists.txt Outdated Show resolved Hide resolved
libs/qhttpserver/CMakeLists.txt Show resolved Hide resolved
Engine/CMakeLists.txt Show resolved Hide resolved
@devernay
Copy link
Member Author

commits from one PR are usually squashed anyway.

@devernay devernay merged commit 395c222 into RB-2.5 Aug 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants