diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-25 16:06:48 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-25 16:06:48 -0600 |
| commit | e5e6497cb7ef4cc3d384c1f01962f99934cc1eee (patch) | |
| tree | b07acf62110358224eecf016c6238c012d432fb3 | |
| parent | e1f0701a044549183106d857deaae291cc5950b0 (diff) | |
| download | kbfx-e5e6497c.tar.gz kbfx-e5e6497c.zip | |
Fix FTBFS again
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -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 |
7 files changed, 33 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d8f9842..5dc01cb 100644 --- a/CMakeLists.txt +++ b/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") 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 3fe72bc..b47226c 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 d2e2ced..527e9ce 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 8925144..37a3fe1 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 6cb36b8..fc09b22 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 9f40b46..4b3d21f 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 ) |