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

List:       kde-commits
Subject:    [kdelibs/frameworks] staging/kde4support: Get KDE4Support to export targets and have proper config f
From:       Kevin Ottens <ervin () kde ! org>
Date:       2013-10-28 12:33:57
Message-ID: E1Vam17-0004xM-DW () scm ! kde ! org
[Download RAW message or body]

Git commit 11609c3b69db2d53fdc54c31c79cd4890f1c1cdd by Kevin Ottens.
Committed on 28/10/2013 at 11:56.
Pushed by ervin into branch 'frameworks'.

Get KDE4Support to export targets and have proper config file

M  +3    -2    staging/kde4support/CMakeLists.txt
M  +4    -2    staging/kde4support/KDE4SupportConfig.cmake.in
M  +1    -1    staging/kde4support/src/CMakeLists.txt

http://commits.kde.org/kdelibs/11609c3b69db2d53fdc54c31c79cd4890f1c1cdd

diff --git a/staging/kde4support/CMakeLists.txt b/staging/kde4support/CMake=
Lists.txt
index 28571be..89a278f 100644
--- a/staging/kde4support/CMakeLists.txt
+++ b/staging/kde4support/CMakeLists.txt
@@ -8,10 +8,11 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_=
SOURCE_DIR}/cmake )
 =

 find_package(KF5 5.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDirs)
 =

-find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS Network Widgets DBus =
Test Svg Concurrent PrintSupport)
+set(QT_REQUIRED_VERSION 5.2.0)
+find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE COMPONENTS Netw=
ork Widgets DBus Test Svg Concurrent PrintSupport)
 =

 if(NOT WIN32)
-    find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS X11Extras)
+    find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE COMPONENTS =
X11Extras)
 endif(NOT WIN32)
 =

 find_package(Strigi 0.6.3 QUIET)
diff --git a/staging/kde4support/KDE4SupportConfig.cmake.in b/staging/kde4s=
upport/KDE4SupportConfig.cmake.in
index c2557a0..c3c1597 100644
--- a/staging/kde4support/KDE4SupportConfig.cmake.in
+++ b/staging/kde4support/KDE4SupportConfig.cmake.in
@@ -1,6 +1,8 @@
 @PACKAGE_INIT@
 =

+find_dependency(KCoreAddons "@KF5_VERSION@")
+find_dependency(KConfigWidgets "@KF5_VERSION@")
+find_dependency(Qt5DBus @QT_REQUIRED_VERSION@)
+find_dependency(Qt5Xml @QT_REQUIRED_VERSION@)
 =

 include("${CMAKE_CURRENT_LIST_DIR}/KDE4SupportTargets.cmake")
-
-set(KDE4Support_LIBRARIES KDE4__KDE4Support)
diff --git a/staging/kde4support/src/CMakeLists.txt b/staging/kde4support/s=
rc/CMakeLists.txt
index 1348250..8257c1b 100644
--- a/staging/kde4support/src/CMakeLists.txt
+++ b/staging/kde4support/src/CMakeLists.txt
@@ -322,7 +322,7 @@ set_target_properties(KDE4Support PROPERTIES VERSION ${=
KDE4SUPPORT_VERSION_STRIN
                                   SOVERSION ${KDE4SUPPORT_SOVERSION} )
 =

 install(TARGETS KDE4Support
-        EXPORT kdelibsLibraryTargets # KDE4SupportTargets <- cannot be mov=
ed to separate export set as long as kde4support depends on kdelibs and kde=
libs depends on kde4support
+        EXPORT KDE4SupportTargets
         ${INSTALL_TARGETS_DEFAULT_ARGS})
 =

 install(FILES

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