summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-06-18 18:38:56 +0200
committerSlávek Banko <slavek.banko@axis.cz>2020-06-18 18:38:58 +0200
commitf49ad59af0fb02cb29968960cb6a380649dc07c6 (patch)
treea0e5ce9ad78b07ffc6c71bfd3cf89088f15ba222
parent956b575acf57dacc1a058c881dcbcb4bf4a4011b (diff)
downloadtdesdk-f49ad59a.tar.gz
tdesdk-f49ad59a.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>
-rw-r--r--kbugbuster/CMakeLists.txt2
-rw-r--r--kbugbuster/backend/CMakeLists.txt8
-rw-r--r--kbugbuster/tderesources/CMakeLists.txt2
3 files changed, 3 insertions, 9 deletions
diff --git a/kbugbuster/CMakeLists.txt b/kbugbuster/CMakeLists.txt
index 6f71829..a63fbcb 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 64b8ca6..cb3b83c 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 53b47ad..c300829 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}
)