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

Use cmake import targets part 1 #1737

Merged
merged 12 commits into from
Nov 2, 2024

Conversation

n-morales
Copy link
Contributor

This is the first batch of conversions to cmake import targets. There are a lot more beyond this

I've tested these with the v2 builds for both windows and linux -- ideally this shouldn't affect anything beyond the way in which cmake finds things but it should probably be tested thoroughly.

Libraries are separated into different commits, so I can split this further if needed.

@@ -257,6 +257,18 @@ macro (catch_regex_group pattern group var str)
endmacro (catch_regex_group)


# macro that adds "fontconfig fontconfig-1" to find_library on win32
macro(find_fontconfig_hack)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm sorry for adding this, I don't know why the windows libraries are named weirdly in our dependencies

Copy link
Collaborator

@p2004a p2004a left a comment

Choose a reason for hiding this comment

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

Nice! Have you tested under msvc? We also don't want to break that target

tools/unitsync/CMakeLists.txt Show resolved Hide resolved
rts/lib/lua/CMakeLists.txt Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
@n-morales
Copy link
Contributor Author

Nice! Have you tested under msvc? We also don't want to break that target

@p2004a Good point, I do have a windows install I can try it on, so I'll get to that and report back

@n-morales
Copy link
Contributor Author

n-morales commented Nov 1, 2024

@p2004a I verified that this builds on windows + MSVC (btw do we have a CI machine that we can have for that? We might be able to get something with github runners or appveyor for free since BAR is open source)

Ack no, I thought i built properly but there are some weird issues

Ok that was just the ALL_BUILD which fails on master anyway but engine-legacy builds fine :)

rts/CMakeLists.txt Outdated Show resolved Hide resolved
@n-morales n-morales force-pushed the use-cmake-import-targets branch from 0d1da54 to 9192311 Compare November 2, 2024 20:23
@p2004a p2004a merged commit 5e60482 into beyond-all-reason:master Nov 2, 2024
2 checks passed
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