diff options
| author | Slávek Banko <[email protected]> | 2015-06-12 02:56:58 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2015-06-12 03:00:32 +0200 |
| commit | 46b20a55775c6c44591ff2d2d423399887ebc806 (patch) | |
| tree | 6e2264bf4578861f4adacce599e43a63441a7a0c /kxkb | |
| parent | 32eee8cad4fd7bf38b98e5c8db0455bed75e03bc (diff) | |
| download | tdebase-46b20a55775c6c44591ff2d2d423399887ebc806.tar.gz tdebase-46b20a55775c6c44591ff2d2d423399887ebc806.zip | |
Fix FTBFS on freebsd
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 08122b137e76ffcf7067f634a7668002732e11d9)
Diffstat (limited to 'kxkb')
| -rw-r--r-- | kxkb/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kxkb/ConfigureChecks.cmake | 5 |
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() |