Commit 6794b9d9 authored by Heiko Becker's avatar Heiko Becker
Browse files

Fix clean parallel build

The newly introduced krfb-virtualmonitor also needs
ui_connectionwidget.h (via rfbclient -> connectiondialog) and fails
with "krfb/connectiondialog.h:25:10: fatal error: ui_connectionwidget.h:
No such file or directory #include "ui_connectionwidget.h" when doing
a clean build with a high enough number of jobs.
Fix it by introducing a krfb_UI_SRCS variable, which is used by both
executable targets.
parent cf2d198c
Pipeline #98410 passed with stage
in 44 seconds
...@@ -78,7 +78,7 @@ kconfig_add_kcfg_files (krfb_SRCS ...@@ -78,7 +78,7 @@ kconfig_add_kcfg_files (krfb_SRCS
krfbconfig.kcfgc krfbconfig.kcfgc
) )
ki18n_wrap_ui (krfb_SRCS ki18n_wrap_ui (krfb_UI_SRCS
ui/configtcp.ui ui/configtcp.ui
ui/configsecurity.ui ui/configsecurity.ui
ui/configframebuffer.ui ui/configframebuffer.ui
...@@ -92,6 +92,7 @@ qt5_add_resources(krfb_SRCS ...@@ -92,6 +92,7 @@ qt5_add_resources(krfb_SRCS
add_executable (krfb add_executable (krfb
${krfb_SRCS} ${krfb_SRCS}
${krfb_UI_SRCS}
) )
target_link_libraries (krfb target_link_libraries (krfb
...@@ -136,7 +137,7 @@ ecm_qt_declare_logging_category(krfbvm_SRCS ...@@ -136,7 +137,7 @@ ecm_qt_declare_logging_category(krfbvm_SRCS
EXPORT KRFB EXPORT KRFB
) )
add_executable(krfb-virtualmonitor main-virtualmonitor.cpp ${krfbvm_SRCS} add_executable(krfb-virtualmonitor main-virtualmonitor.cpp ${krfbvm_SRCS} ${krfb_UI_SRCS}
rfbserver.cpp rfbclient.cpp rfbservermanager.cpp eventsmanager.cpp framebuffermanager.cpp sockethelpers.cpp) rfbserver.cpp rfbclient.cpp rfbservermanager.cpp eventsmanager.cpp framebuffermanager.cpp sockethelpers.cpp)
target_link_libraries(krfb-virtualmonitor target_link_libraries(krfb-virtualmonitor
krfbprivate krfbprivate
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment