diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-25 16:06:48 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-07-05 20:03:26 +0200 |
| commit | b660e32ddac48bd468dc2211aac66342bfd20cf4 (patch) | |
| tree | 3d39aa54bbd787bf8a2941590ef55a0af93aca9d /plugins | |
| parent | e93b262def08a11ea7a205acf7c32ee1cb0401d0 (diff) | |
| download | kbfx-b660e32ddac48bd468dc2211aac66342bfd20cf4.tar.gz kbfx-b660e32ddac48bd468dc2211aac66342bfd20cf4.zip | |
Fix FTBFS again
(cherry picked from commit e5e6497cb7ef4cc3d384c1f01962f99934cc1eee)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugins/applications/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | plugins/plasmoids/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | plugins/recentstuff/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | plugins/settings/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | plugins/strigi/CMakeLists.txt | 6 |
6 files changed, 33 insertions, 3 deletions
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 14350db..1a64e9e 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -14,4 +14,4 @@ add_subdirectory( common ) add_subdirectory( plasmoids ) add_subdirectory( recentstuff ) add_subdirectory( settings ) -add_subdirectory( strigi )
\ No newline at end of file +tde_conditional_add_subdirectory( USE_STRIGI strigi ) diff --git a/plugins/applications/CMakeLists.txt b/plugins/applications/CMakeLists.txt index 9948802..659fadd 100644 --- a/plugins/applications/CMakeLists.txt +++ b/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 ) diff --git a/plugins/plasmoids/CMakeLists.txt b/plugins/plasmoids/CMakeLists.txt index 0e9fde2..c251c56 100644 --- a/plugins/plasmoids/CMakeLists.txt +++ b/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 ) diff --git a/plugins/recentstuff/CMakeLists.txt b/plugins/recentstuff/CMakeLists.txt index 2b05353..9b232e5 100644 --- a/plugins/recentstuff/CMakeLists.txt +++ b/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 ) diff --git a/plugins/settings/CMakeLists.txt b/plugins/settings/CMakeLists.txt index b3d8045..610e8d5 100644 --- a/plugins/settings/CMakeLists.txt +++ b/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)
\ No newline at end of file +INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins) diff --git a/plugins/strigi/CMakeLists.txt b/plugins/strigi/CMakeLists.txt index 9d9e1f3..81c2333 100644 --- a/plugins/strigi/CMakeLists.txt +++ b/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 ) |