summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatías Fonzo <selk@dragora.org>2021-02-09 20:59:29 -0300
committerMatías Fonzo <selk@dragora.org>2021-02-09 20:59:29 -0300
commite83bf5f7b27c1ae4cf5b1ad41fa7d0116fdf5626 (patch)
treefeb7993311d827ad78d9248f59ac0113c3a457d2
parentce09b7d5e8a8df11ba58723dbce8e1ea6278b54f (diff)
downloadtdelibs-fix/tdecore-CMakeLists.tar.gz
tdelibs-fix/tdecore-CMakeLists.zip
Fixed build issues under private linking for exported CMake targets.fix/tdecore-CMakeLists
Commit 158b6e1152413e4fa973b70b7469bb1f256a1f38[1] introduced a change in tdecore/CMakeLists.txt (lines 140~149) to make private linking for CMake targets. This leads to the following build errors when I was trying to update from TDE 14.0.7 to 14.0.9 here in Dragora GNU/Linux-Libre[2]. The proposed change accommodates lines to pass ${XCOMPOSITE_LIBRARIES} (-lXcomposite) when the presence of libXcomposite is detected, it also accommodates ${KDESVGICONS} to circumvent the build error, leaving these two variables out of the private linking statement. [1] https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/commit/158b6e1152413e4fa973b70b7469bb1f256a1f38 [2] http://ix.io/2OTG Signed-off-by: Matías Fonzo <selk@dragora.org>
-rw-r--r--tdecore/CMakeLists.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index eed7dee5..be6c1e4e 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -142,10 +142,10 @@ tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 14.0.0
EMBED tdecorenetwork-static ${TDEHW_LIB}
- LINK DCOP-shared tdefx-shared ICE SM ${ZLIB_LIBRARIES}
- LINK_PRIVATE ltdlc-static ${KDESVGICONS} ${XCOMPOSITE_LIBRARIES}
- ${LIBIDN_LIBRARIES} ${LIBBFD_LIBRARIES} ${LIB_UTIL} ${GAMIN_LIBRARIES}
- ${Backtrace_LIBRARY}
+ LINK ltdlc-static DCOP-shared tdefx-shared ICE SM ${ZLIB_LIBRARIES}
+ ${KDESVGICONS} ${XCOMPOSITE_LIBRARIES}
+ LINK_PRIVATE ${LIBIDN_LIBRARIES} ${LIBBFD_LIBRARIES} ${LIB_UTIL}
+ ${GAMIN_LIBRARIES} ${Backtrace_LIBRARY}
DESTINATION ${LIB_INSTALL_DIR}
)