summaryrefslogtreecommitdiffstats
path: root/kxkb
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-06-12 02:56:58 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-06-12 02:56:58 +0200
commit08122b137e76ffcf7067f634a7668002732e11d9 (patch)
tree30507bd9b39b46525b8941f1986dff2fa30f03af /kxkb
parente1d8ccc637042d5ab84b0d532590f4cf8ef8e567 (diff)
downloadtdebase-08122b137e76ffcf7067f634a7668002732e11d9.tar.gz
tdebase-08122b137e76ffcf7067f634a7668002732e11d9.zip
Fix FTBFS on freebsd
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kxkb')
-rw-r--r--kxkb/CMakeLists.txt4
-rw-r--r--kxkb/ConfigureChecks.cmake5
2 files changed, 7 insertions, 2 deletions
diff --git a/kxkb/CMakeLists.txt b/kxkb/CMakeLists.txt
index 9ba350e94..872443229 100644
--- a/kxkb/CMakeLists.txt
+++ b/kxkb/CMakeLists.txt
@@ -40,7 +40,7 @@ tde_add_kpart( kcm_keyboard AUTOMOC
extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp
pixmap.cpp kcmlayout.cpp kcmlayoutwidget.ui
kcmmisc.cpp kcmmiscwidget.ui
- LINK tdeio-shared xkbfile ${XTEST_LIBRARIES}
+ LINK tdeio-shared ${XKBFILE_LIBRARIES} ${XTEST_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@@ -52,5 +52,5 @@ tde_add_tdeinit_executable( kxkb AUTOMOC
extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp
pixmap.cpp layoutmap.cpp kxkb.cpp kxkbtraywindow.cpp
kxkb.skel
- LINK tdeui-shared xkbfile
+ LINK tdeui-shared ${XKBFILE_LIBRARIES}
)
diff --git a/kxkb/ConfigureChecks.cmake b/kxkb/ConfigureChecks.cmake
index 4bf356bc4..edb387849 100644
--- a/kxkb/ConfigureChecks.cmake
+++ b/kxkb/ConfigureChecks.cmake
@@ -13,3 +13,8 @@ find_program( SETXKBMAP setxkbmap )
if( SETXKBMAP-NOTFOUND )
tde_message_fatal( "setxkbmap is required, but not found on your system" )
endif()
+
+pkg_search_module( XKBFILE xkbfile )
+if( NOT XKBFILE_FOUND )
+ tde_message_fatal( "xkbfile is requested, but was not found on your system" )
+endif()