Path: blob/main/deskutils/charmtimetracker/files/patch-Charm_CMakeLists.txt
18157 views
Munge (effectively) -L/usr/local/lib into the link lines.12QtKeyChain's cmake config lists the libraries it depends on:3- a bunch of Qt5 libraries, which are imported targets, and hence4already have full paths for CMake5- other libraries, like libsecret-1, gio, gobject .. which are not6set up as imported targets; these are not found at link-time unless7the directory is added to -L. They do have a pkg-config file,8so we'll look for (only) libsecret-1 and just add the directory it9lives in -- hopefully the other libraries live there too.1011Error message otherwise:1213: && /usr/bin/c++ -O2 -pipe -fstack-protector -fno-strict-aliasing -std=c++0x -fno-exceptions -Wno-gnu-zero-variadic-macro-arguments -Wall -Wextra -Wcast-align -Wchar-subscripts -Wformat-security -Wno-long-long -Wpointer-arith -Wundef -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type -Wvla -Wdate-time -fdiagnostics-color=always -pedantic -O2 -pipe -fstack-protector -fno-strict-aliasing -Wl,--enable-new-dtags -fstack-protector Charm/CMakeFiles/charmtimetracker.dir/Charm.cpp.o Charm/CMakeFiles/charmtimetracker.dir/qrc_CharmResources.cpp.o Charm/CMakeFiles/charmtimetracker.dir/charmtimetracker_autogen/mocs_compilation.cpp.o -o Charm/charmtimetracker -Wl,-rpath,/usr/local/lib:/usr/local/lib/qt5: Charm/libCharmApplication.a Core/libCharmCore.a /usr/local/lib/libxcb.so /usr/local/lib/libxcb-screensaver.so /usr/local/lib/qt5/libQt5Network.so.5.10.1 /usr/local/lib/qt5/libQt5PrintSupport.so.5.10.1 /usr/local/lib/libqt5keychain.so.0.9.0 -lsecret-1 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lintl /usr/local/lib/qt5/libQt5DBus.so.5.10.1 /usr/local/lib/qt5/libQt5Widgets.so.5.10.1 /usr/local/lib/qt5/libQt5Gui.so.5.10.1 /usr/local/lib/qt5/libQt5Xml.so.5.10.1 /usr/local/lib/qt5/libQt5Sql.so.5.10.1 /usr/local/lib/qt5/libQt5Core.so.5.10.1 -Wl,-rpath-link,/usr/local/lib && :14/usr/bin/ld: cannot find -lsecret-1151617--- Charm/CMakeLists.txt.orig 2018-09-01 10:20:52 UTC18+++ Charm/CMakeLists.txt19@@ -170,6 +170,25 @@ ADD_LIBRARY(20${CharmApplication_SRCS} ${UiGenerated_SRCS}21)2223+# Need to find support-libraries for qt5keychain24+set( CharmExtra_LIBS "" )25+include( FindPkgConfig )26+pkg_search_module( _lso libsecret-1 )27+if( _lso_FOUND )28+ find_library( _lso_lib NAMES ${_lso_LIBRARIES} HINTS ${_lso_LIBRARY_DIRS} )29+ if ( _lso_lib )30+ # The issue is that qtkeychain lists libraries with no31+ # imported targets.32+ #33+ # set( CharmExtra_LIBS ${_lso_lib} )34+ link_directories( ${_lso_LIBRARY_DIRS} )35+ else()36+ message( WARNING "Found libsecret-1, but not ${_lso_LIBRARIES}" )37+ endif()38+else()39+ message( WARNING "Could not find libsecret-1" )40+endif()41+42kde_target_enable_exceptions( CharmApplication PUBLIC )43TARGET_LINK_LIBRARIES(CharmApplication ${CharmApplication_LIBS}44Qt5::Core454647