kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Add missed LINUX condition

Browse source
This commit is contained in:
Ilya Fedin 2021-10-21 16:57:30 +04:00 • committed by John Preston
parent 8540bd0b60
commit 02993a6c82
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
external/qt/CMakeLists.txt vendored
View file

@ -42,7 +42,7 @@ if (DESKTOP_APP_USE_PACKAGED)
) )
endif() endif()
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(external_qt INTERFACE Qt5::WaylandClient) target_link_libraries(external_qt INTERFACE Qt5::WaylandClient)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
@ -80,7 +80,7 @@ else()
) )
endif() endif()
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/include/QtWaylandClient ${qt_loc}/include/QtWaylandClient
@ -115,7 +115,7 @@ else()
) )
endif() endif()
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
QT_WAYLANDCLIENT_LIB QT_WAYLANDCLIENT_LIB

6
external/qt/qt6/CMakeLists.txt vendored
View file

@ -30,7 +30,7 @@ if (DESKTOP_APP_USE_PACKAGED)
target_link_libraries(external_qt INTERFACE Qt6::DBus) target_link_libraries(external_qt INTERFACE Qt6::DBus)
endif() endif()
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(external_qt INTERFACE Qt6::WaylandClient) target_link_libraries(external_qt INTERFACE Qt6::WaylandClient)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
@ -62,7 +62,7 @@ else()
) )
endif() endif()
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_include_directories(external_qt SYSTEM target_include_directories(external_qt SYSTEM
INTERFACE INTERFACE
${qt_loc}/include/QtWaylandClient ${qt_loc}/include/QtWaylandClient
@ -93,7 +93,7 @@ else()
) )
endif() endif()
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
QT_WAYLANDCLIENT_LIB QT_WAYLANDCLIENT_LIB