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 support for older CMake #517

Merged
merged 1 commit into from May 24, 2020
Merged

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented May 19, 2020

I used add_compile_definitions() in #515, which is CMake 3.12+ only. (Oops.) Switch to add_definitions() which has been supported since the dawn of time.

add_compile_definitions() is CMake 3.12+ only.
@ferdnyc ferdnyc added build Issues related to compiling or installing libopenshot and its dependencies bindings libopenshot's Python or Ruby interface bindings labels May 19, 2020
@codecov-commenter
Copy link

codecov-commenter commented May 19, 2020

Codecov Report

Merging #517 into develop will increase coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #517      +/-   ##
===========================================
+ Coverage    48.23%   48.28%   +0.04%     
===========================================
  Files          128      128              
  Lines         9949    10132     +183     
===========================================
+ Hits          4799     4892      +93     
- Misses        5150     5240      +90     
Impacted Files Coverage Δ
src/FFmpegReader.cpp 68.79% <0.00%> (+0.46%) ⬆️
src/Clip.cpp 41.25% <0.00%> (+1.49%) ⬆️
src/QtImageReader.cpp 61.32% <0.00%> (+4.71%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 25ca2d0...128bacc. Read the comment docs.

@ferdnyc
Copy link
Contributor Author

ferdnyc commented May 19, 2020

*sigh* NOPE. It seems I broke Travis again, somehow. 😠

@ferdnyc
Copy link
Contributor Author

ferdnyc commented May 19, 2020

@jonoomph I don't know what happened here, but if you're able to either unfuck Travis or forcibly merge this, that'd be a help. I'm guessing at least one of the Gitlab builders is currently breaking on the CMake 3.12 command I accidentally merged into the repo (and now can't fix).

@jonoomph jonoomph merged commit 972c290 into OpenShot:develop May 24, 2020
@ferdnyc
Copy link
Contributor Author

ferdnyc commented May 24, 2020

@jonoomph This change, BTW, was made for the Debian folks, in hopes of getting a newer version of OpenShot finally packaged into their repos. See #515, OpenShot/libopenshot-audio#97, and most of all the Debian bug I linked to from those, for all the gory details.

@ferdnyc ferdnyc deleted the ruby-build-fix branch June 2, 2020 07:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bindings libopenshot's Python or Ruby interface bindings build Issues related to compiling or installing libopenshot and its dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants