Skip to content

Commit

Permalink
[WPE] Fix build without journald after 271330@main
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=265663

Reviewed by Michael Catanzaro.

* Source/WTF/wtf/PlatformGTK.cmake:
* Source/WTF/wtf/PlatformWPE.cmake:

Drive-by fix to use ENABLE_JOURNALD_LOG instead of Journald_FOUND.

* Source/WebKit/WPEPlatform/wpe/drm/CMakeLists.txt:

The Journald::Journald target should not be used if journald support
is not enabled.

Canonical link: https://commits.webkit.org/271392@main
  • Loading branch information
blino committed Dec 1, 2023
1 parent 0abd65c commit 0e4ff5c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Source/WTF/wtf/PlatformGTK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ list(APPEND WTF_LIBRARIES
ZLIB::ZLIB
)

if (Journald_FOUND)
if (ENABLE_JOURNALD_LOG)
list(APPEND WTF_LIBRARIES Journald::Journald)
endif ()

Expand Down
2 changes: 1 addition & 1 deletion Source/WTF/wtf/PlatformWPE.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ list(APPEND WTF_LIBRARIES
ZLIB::ZLIB
)

if (Journald_FOUND)
if (ENABLE_JOURNALD_LOG)
list(APPEND WTF_LIBRARIES Journald::Journald)
endif ()

Expand Down
5 changes: 4 additions & 1 deletion Source/WebKit/WPEPlatform/wpe/drm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,15 @@ set(WPEPlatformDRM_SYSTEM_INCLUDE_DIRECTORIES
)

set(WPEPlatformDRM_LIBRARIES
Journald::Journald
LibInput::LibInput
Udev::Udev
${GIO_UNIX_LIBRARIES}
)

if (ENABLE_JOURNALD_LOG)
list(APPEND WPEPlatformDRM_LIBRARIES Journald::Journald)
endif ()

set(WPEPlatformDRM_SOURCES_FOR_INTROSPECTION
${WPEPlatformDRM_INSTALLED_HEADERS}
${WPEPlatformDRM_SOURCES}
Expand Down

0 comments on commit 0e4ff5c

Please sign in to comment.