diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-06-18 18:38:56 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-06-19 10:19:10 +0200 |
| commit | a6048b8b5d1195f0736469c0670456ed9f24570c (patch) | |
| tree | 65ebcf8198ad4443d6c3b5aebf95a8a29bf32668 | |
| parent | 0ed1f8dbedca3eff92941e2a1181b90425560f68 (diff) | |
| download | tdesdk-a6048b8b5d1195f0736469c0670456ed9f24570c.tar.gz tdesdk-a6048b8b5d1195f0736469c0670456ed9f24570c.zip | |
kbugbuster: Build only the PIC variant of the static backend library.
This should resolve the occasional FTBFS caused by double generation
of the same MOC files.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f49ad59af0fb02cb29968960cb6a380649dc07c6)
| -rw-r--r-- | kbugbuster/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kbugbuster/backend/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | kbugbuster/tderesources/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/kbugbuster/CMakeLists.txt b/kbugbuster/CMakeLists.txt index 6f71829d..a63fbcb5 100644 --- a/kbugbuster/CMakeLists.txt +++ b/kbugbuster/CMakeLists.txt @@ -38,7 +38,7 @@ install( FILES kbugbuster.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_executable( kbugbuster SOURCES main.cpp LINK - kbbmainwindow-static kbbbackend_nopic-static + kbbmainwindow-static kbbbackend-static tdeutils-shared tdeio-shared tdehtml-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kbugbuster/backend/CMakeLists.txt b/kbugbuster/backend/CMakeLists.txt index 64b8ca6b..cb3b83c2 100644 --- a/kbugbuster/backend/CMakeLists.txt +++ b/kbugbuster/backend/CMakeLists.txt @@ -26,12 +26,6 @@ set( SRCS rdfprocessor.cpp htmlparser.cpp kbbprefs.cpp ) -tde_add_library( kbbbackend_nopic STATIC AUTOMOC +tde_add_library( kbbbackend STATIC_PIC AUTOMOC SOURCES ${SRCS} ) - -if( WITH_KCAL ) - tde_add_library( kbbbackend_pic STATIC_PIC AUTOMOC - SOURCES ${SRCS} - ) -endif( ) diff --git a/kbugbuster/tderesources/CMakeLists.txt b/kbugbuster/tderesources/CMakeLists.txt index 53b47ad8..c3008292 100644 --- a/kbugbuster/tderesources/CMakeLists.txt +++ b/kbugbuster/tderesources/CMakeLists.txt @@ -38,6 +38,6 @@ tde_add_kpart( kcal_bugzilla AUTOMOC SOURCES kcalresource.cpp kcalresourceconfig.cpp kcalresource_plugin.cpp resourceprefs.kcfgc - LINK kbbbackend_pic-static tdecore-shared tdeio-shared tdeabc kcal tderesources + LINK kbbbackend-static tdecore-shared tdeio-shared tdeabc kcal tderesources DESTINATION ${PLUGIN_INSTALL_DIR} ) |