Use the vcpkg-enabled version of cesium-native. #1447
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jherico
reviewed
Jun 7, 2024
extern/CMakeLists.txt
Outdated
| # On Mac and Linux, Unreal uses -fvisibility-ms-compat. | ||
| # On Android, it uses -fvisibility=hidden | ||
| if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-ms-compat -fvisibility-inlines-hidden") | ||
| elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Android") | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidde\n -fvisibility-inlines-hidden") |
There was a problem hiding this comment.
😆 I don't know where that came from. I must have fat-fingered it. Thanks for flagging it!
To warm up the vcpkg cache.
This is likely to break platforms other than Linux.
We can't use macos-14 because it doesn't have xcode 14.2, which Unreal requires.
Apparently macos-13-arm64 isn't actually a thing.
Hopefully that will be good enough.
It should be less necessary now that we're using swl-variant, and it causes problems packaging for Linux from Windows.
Use C++20 and swl::variant instead of std::variant.
|
Just dropping a reminder for myself here that this PR also removes the debug section compression on Linux. The compressed debug sections cause linker errors when cross-compiling for Linux from Windows:
Now that the binaries aren't so enormous, compressing the debug sections isn't as essential. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This depends on CesiumGS/cesium-native#820.
To do:
CC @jherico (thanks for all your work on this on the cesium-native side!)