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

Enable IN_LIST in older CMake #542

Merged
merged 1 commit into from Jul 8, 2020
Merged

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented Jul 8, 2020

Should fix #510 breakage on gitlab builders.

@ferdnyc ferdnyc added the build Issues related to compiling or installing libopenshot and its dependencies label Jul 8, 2020
@ferdnyc ferdnyc merged commit 8cc33b2 into OpenShot:develop Jul 8, 2020
@codecov
Copy link

codecov bot commented Jul 8, 2020

Codecov Report

Merging #542 into develop will decrease coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #542      +/-   ##
===========================================
- Coverage    48.81%   48.77%   -0.04%     
===========================================
  Files          129      129              
  Lines        10042    10035       -7     
===========================================
- Hits          4902     4895       -7     
  Misses        5140     5140              
Impacted Files Coverage Δ
src/FFmpegWriter.cpp 62.48% <0.00%> (-0.28%) ⬇️
include/DummyReader.h 0.00% <0.00%> (ø)

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 8af624f...85b6a96. Read the comment docs.

@ferdnyc ferdnyc deleted the store-qt-version branch July 8, 2020 22:04
@jonoomph
Copy link
Member

jonoomph commented Jul 8, 2020

Linux builder is happy now! Nice!

@ferdnyc
Copy link
Contributor Author

ferdnyc commented Jul 8, 2020

Yeah, I guess technically this increases our minimum CMake version to 3.3 (which is where IN_LIST was introduced) — I could've also fixed this by changing the version range to 3.3...3.17 here:

cmake_minimum_required(VERSION 3.2...3.14 FATAL_ERROR)

Which would've made CMP0057 default to NEW behavior automatically. I guess in CMake 3.7 (version on the Linux builder) it was still defaulting to OLD, though they obviously dropped that at some point after.

Trying to build libopenshot with CMake 3.2 will likely now break when it hits the IN_LIST, but really who's going to try to do that? ¯\_(ツ)_/¯

@jonoomph
Copy link
Member

jonoomph commented Jul 8, 2020

...but really who's going to try to do that? ¯\_(ツ)_/¯

I guess we'll find out! haha

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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

2 participants