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

Allow vcpkg overlays to be specified as CMake variables #946

Merged
merged 3 commits into from
Sep 30, 2024

Conversation

lilleyse
Copy link
Contributor

Currently projects using cesium-native set VCPKG_OVERLAY_PORTS and VCPKG_OVERLAY_TRIPLETS as environment variables. This PR allows you to instead set them as regular CMake variables, like what we do for VCPKG_TRIPLET.

@jherico would this be a welcome change to bring back into https://github.com/jherico/ezvcpkg?

@jherico
Copy link
Contributor

jherico commented Sep 10, 2024

@lilleyse I'll investigate. I haven't actually done anything overlay specific with ezvcpkg or vcpkg in general yet, so I have little experience. This change seems straightforward enough though. If you want to create a PR I'll likely merge it quickly.

@kring kring added this to the October 2024 Release milestone Sep 17, 2024
@kring
Copy link
Member

kring commented Sep 30, 2024

@azrogers the compiler argument code in compiler.cmake shouldn't be uncommented, because compiler options added in that way will apply globally, but just to cesium-native libraries. This isn't so much a problem in cesium-native, because everything outside cesium-native is built by vcpkg, which will not be affected. But other projects that use cesium-native can and do have third-party libraries, and we don't want to mess with their compiler flags.

The cmake code that sets the warnings for just the cesium-native libraries is here:

target_compile_options(${targetName} PRIVATE /W4 /WX /wd4201 /bigobj /w45038 /w44254 /w44242 /w44191 /w45220)

@lilleyse
Copy link
Contributor Author

@azrogers could you also revert the formatting changes in configure_cesium_library.cmake and compiler.cmake?

@kring kring merged commit 3a1c48f into main Sep 30, 2024
24 checks passed
@kring kring deleted the ezvcpkg-overlay-vars branch September 30, 2024 23:07
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.

4 participants