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.

Sign up for GitHub

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

Correct generated cmake syntax #24016

Merged
merged 1 commit into from
Mar 13, 2025
Merged

Correct generated cmake syntax #24016

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tools/python/util/vcpkg_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ def generate_triplet_for_android(
# Valid options are dynamic and static. Libraries can ignore this setting if they do not support the preferred linkage type. In our case, we prefer to use static libs.
f.write("set(VCPKG_LIBRARY_LINKAGE static)\n")
if not enable_rtti:
f.write("set(CMAKE_ANDROID_RTTI OFF)")
f.write("set(CMAKE_ANDROID_RTTI OFF)\n")
if not enable_exception:
f.write("set(CMAKE_ANDROID_EXCEPTIONS OFF)")
f.write("set(CMAKE_ANDROID_EXCEPTIONS OFF)\n")
if use_cpp_shared:
f.write("set(ANDROID_STL c++_shared)")
f.write("set(ANDROID_STL c++_shared)\n")

ldflags = []

Expand Down
Loading