Fix FTBFS again

(cherry picked from commit e5e6497cb7)

CMakeLists.txt

@@ -106,7 +106,6 @@ add_subdirectory( images )
 add_subdirectory( plugins )
 tde_conditional_add_subdirectory( BUILD_DOC doc )
 tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
-tde_conditional_add_subdirectory( USE_STRIGI plugins/strigi )
 
 SET(DIST_INCLUDE "kbfx-9999.ebuild kbfx.spec kbfx-${GENTOO_VERSION}.ebuild strigi-${STRIGI_VERSION}.ebuild")
 SET(DIST_EXCLUDE "Helperstuff")

plugins/CMakeLists.txt

@@ -14,4 +14,4 @@ add_subdirectory( common )
 add_subdirectory( plasmoids )
 add_subdirectory( recentstuff )
 add_subdirectory( settings )
-add_subdirectory( strigi )
+tde_conditional_add_subdirectory( USE_STRIGI strigi )

plugins/applications/CMakeLists.txt

@@ -13,12 +13,18 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${TDE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/kbfxlib/common
+  ${CMAKE_SOURCE_DIR}/kbfxlib/data
+  ${CMAKE_SOURCE_DIR}/plugins/common
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
+  ${CMAKE_BINARY_DIR}/kbfxlib/common
+  ${CMAKE_BINARY_DIR}/kbfxlib/data
 )
 
 

plugins/plasmoids/CMakeLists.txt

@@ -13,12 +13,18 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${TDE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/kbfxlib/common
+  ${CMAKE_SOURCE_DIR}/kbfxlib/data
+  ${CMAKE_SOURCE_DIR}/plugins/common
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
+  ${CMAKE_BINARY_DIR}/kbfxlib/common
+  ${CMAKE_BINARY_DIR}/kbfxlib/data
 )
 
 

plugins/recentstuff/CMakeLists.txt

@@ -13,12 +13,18 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${TDE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/kbfxlib/common
+  ${CMAKE_SOURCE_DIR}/kbfxlib/data
+  ${CMAKE_SOURCE_DIR}/plugins/common
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
+  ${CMAKE_BINARY_DIR}/kbfxlib/common
+  ${CMAKE_BINARY_DIR}/kbfxlib/data
 )
 
 

plugins/settings/CMakeLists.txt

@@ -13,12 +13,18 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${TDE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/kbfxlib/common
+  ${CMAKE_SOURCE_DIR}/kbfxlib/data
+  ${CMAKE_SOURCE_DIR}/plugins/common
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
+  ${CMAKE_BINARY_DIR}/kbfxlib/common
+  ${CMAKE_BINARY_DIR}/kbfxlib/data
 )
 
 
@@ -27,7 +33,7 @@ link_directories(
 set( target kbfxplasmadatasettings )
 
 set( ${target}_SRCS
-  kbfxplasmadatasettings.cpp
+  kbfxplasmadatapluginsettings.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
@@ -41,4 +47,4 @@ tde_add_library( ${target} SHARED AUTOMOC
 ##### headers #######################################
 
 file( GLOB HEADERS *.h )
-INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins)
+INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins)

plugins/strigi/CMakeLists.txt

@@ -13,12 +13,18 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${TDE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/kbfxlib/common
+  ${CMAKE_SOURCE_DIR}/kbfxlib/data
+  ${CMAKE_SOURCE_DIR}/plugins/common
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
+  ${CMAKE_BINARY_DIR}/kbfxlib/common
+  ${CMAKE_BINARY_DIR}/kbfxlib/data
 )