[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [okular/frameworks] /: Fix linking to KF5 libs
From:       Frederik Gladhorn <frederik.gladhorn () digia ! com>
Date:       2014-08-09 11:47:53
Message-ID: E1XG57p-0003nV-UI () scm ! kde ! org
[Download RAW message or body]

Git commit cebdf978ceace041dc8b6725dccdf7d5b47c7720 by Frederik Gladhorn.
Committed on 09/08/2014 at 10:46.
Pushed by gladhorn into branch 'frameworks'.

Fix linking to KF5 libs

M  +1    -1    CMakeLists.txt
M  +1    -1    shell/CMakeLists.txt

http://commits.kde.org/okular/cebdf978ceace041dc8b6725dccdf7d5b47c7720

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd3adaa..181cb28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,7 @@ qt4_add_dbus_interfaces(okularpart_SRCS ${KDE4_DBUS_INT=
ERFACES_DIR}/org.kde.KSpe
 =

 kde4_add_plugin(okularpart SHARED ${okularpart_SRCS})
 =

-target_link_libraries(okularpart okularcore ${KDE4_KPARTS_LIBS} ${KDE4_KPR=
INTUTILS_LIBS} ${MATH_LIB} ${QIMAGEBLITZ_LIBRARIES} ${KDE4_PHONON_LIBRARY} =
${KDE4_SOLID_LIBRARY})
+target_link_libraries(okularpart okularcore KF5::Parts ${KDE4_KPRINTUTILS_=
LIBS} ${MATH_LIB} ${QIMAGEBLITZ_LIBRARIES} ${KDE4_PHONON_LIBRARY} ${KDE4_SO=
LID_LIBRARY})
 =

 install(TARGETS okularpart DESTINATION ${PLUGIN_INSTALL_DIR})
 =

diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index d64f350..9219402 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -28,7 +28,7 @@ kde4_add_app_icon(okular_SRCS "${CMAKE_CURRENT_SOURCE_DIR=
}/../ui/data/icons/hi*-
 =

 kde4_add_executable(okular ${okular_SRCS})
 =

-target_link_libraries(okular ${KDE4_KPARTS_LIBS} ${KACTIVITIES_LIBRARY})
+target_link_libraries(okular KF5::Parts KF5::KActivities)
 =

 install(TARGETS okular ${INSTALL_TARGETS_DEFAULT_ARGS})
 =


[prev in list] [next in list] [prev in thread] [next in thread]