Skip to content

deps: don't unity-build Abseil; fix vendored wiiuse include #905

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

Merged
jcelerier merged 1 commit into from
Jun 23, 2026
Merged

deps: don't unity-build Abseil; fix vendored wiiuse include #905

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions cmake/deps/abseil.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ if(NOT TARGET absl::strings)
block()
set(BUILD_SHARED_LIBS 0)
set(BUILD_TESTING 0)
# Abseil's .cc files have file-scope statics (kAsciiToInt, ...) that clash
# when batched, so it must not be unity-built.
set(CMAKE_UNITY_BUILD OFF)
set(ABSL_BUILD_TESTING OFF CACHE INTERNAL "")
set(ABSL_PROPAGATE_CXX_STD ON CACHE INTERNAL "")
# Treat Abseil's headers as system headers so that re2 (and ossia) do not
Expand Down
3 changes: 1 addition & 2 deletions src/ossia_features.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,7 @@ endif()

if(OSSIA_PROTOCOL_WIIMOTE)
target_sources(ossia PRIVATE ${OSSIA_WIIMOTE_SRCS} ${OSSIA_WIIMOTE_HEADERS})
ossia_use_system(use_sys wiiuse)
if(NOT use_sys)
if(WIIUSE_DIR)
target_include_directories(ossia PRIVATE "${WIIUSE_DIR}/src")
endif()
target_link_libraries(ossia PRIVATE $<BUILD_INTERFACE:wiiuse>)
Expand Down
Loading