diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2012-12-11 01:32:57 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-12-11 01:37:56 +0100 |
| commit | d8671668feea2501b37a0dff12e6b5035d19f0a8 (patch) | |
| tree | a8f0985c107b9b9e0b1e0297f87c2d432aa15afa | |
| parent | 087a4c9e198e56c6a085077ea0f4d52fa3506bd4 (diff) | |
| download | tdeutils-d8671668feea2501b37a0dff12e6b5035d19f0a8.tar.gz tdeutils-d8671668feea2501b37a0dff12e6b5035d19f0a8.zip | |
Fix cmake build: WITH_POWERBOOK2 option for kmilo
(cherry picked from commit ba743d360eabb06e6ffbafd2c7bc833dd985aa0c)
| -rw-r--r-- | ConfigureChecks.cmake | 27 | ||||
| -rw-r--r-- | kmilo/powerbook/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kmilo/powerbook2/CMakeLists.txt | 2 |
3 files changed, 14 insertions, 17 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 14828bc..2766533 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -117,24 +117,21 @@ endif( ) ##### kmilo ##################################### -if ( BUILD_KMILO ) +if( BUILD_KMILO ) # FIXME: If anybody will ever compile trinity for POWERPC and especialy for -# POWERBOOK he should test those checks and modules - if( WITH_POWERBOOK ) +# POWERBOOK he or she should test workability of those modules + if( WITH_POWERBOOK OR WITH_POWERBOOK2 ) + check_library_exists( "pbb" "init_libpbb" "" HAVE_PBBIPC_LIBRARY ) check_include_file( "pbbipc.h" HAVE_PBBIPC_H ) - if( NOT HAVE_PBBIPC_H ) - tde_message_fatal( "pbbipc.h header is required, but was not found on your system" ) - endif( NOT HAVE_PBBIPC_H ) - endif( WITH_POWERBOOK ) - - if( WITH_POWERBOOK2 ) check_include_file( "pbb.h" HAVE_PBB_H ) - if( NOT HAVE_PBB_H ) - tde_message_fatal( "pbb.h header is required, but was not found on your system" ) - endif( NOT HAVE_PBB_H ) - endif( WITH_POWERBOOK2 ) - -endif (BUILD_KMILO) + if( HAVE_PBBIPC_LIBRARY AND ( ( WITH_POWERBOOK AND HAVE_PBBIPC_H ) OR + ( WITH_POWERBOOK2 AND HAVE_PBB_H ) ) ) + set( PBB_LIBRARY pbb CACHE INTERNAL "" ) + else() + tde_message_fatal( "suitable pbbuttonosd is required, but was not found on your system" ) + endif() + endif( WITH_POWERBOOK OR WITH_POWERBOOK2 ) +endif( BUILD_KMILO ) ##### ksim ###################################### diff --git a/kmilo/powerbook/CMakeLists.txt b/kmilo/powerbook/CMakeLists.txt index 461d2d2..bb98b70 100644 --- a/kmilo/powerbook/CMakeLists.txt +++ b/kmilo/powerbook/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( kmilo_powerbook AUTOMOC SOURCES pb_monitor.cpp - LINK kio-shared kmilo-shared + LINK kio-shared kmilo-shared ${PBB_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmilo/powerbook2/CMakeLists.txt b/kmilo/powerbook2/CMakeLists.txt index 461d2d2..bb98b70 100644 --- a/kmilo/powerbook2/CMakeLists.txt +++ b/kmilo/powerbook2/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_kpart( kmilo_powerbook AUTOMOC SOURCES pb_monitor.cpp - LINK kio-shared kmilo-shared + LINK kio-shared kmilo-shared ${PBB_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) |