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

List:       kde-commits
Subject:    [kdelibs/frameworks] staging/kde4support: Drop hack for cyclic depndencies between kde4support and k
From:       Martin_Gräßlin <mgraesslin () kde ! org>
Date:       2013-08-20 7:31:54
Message-ID: E1VBgPy-00046k-RO () scm ! kde ! org
[Download RAW message or body]

Git commit afce2e83e9fe1e7dd45974f630f3f9a18897a7da by Martin Gr=C3=A4=C3=
=9Flin.
Committed on 20/08/2013 at 07:32.
Pushed by graesslin into branch 'frameworks'.

Drop hack for cyclic depndencies between kde4support and kdelibs

With KDEUI gone this hack seems to be no longer needed. At least with
it installed one cannot build the plasma frameworks. With the hack
removed it builds again.

REVIEW: 112170

M  +0    -13   staging/kde4support/KDE4SupportConfig.cmake.in

http://commits.kde.org/kdelibs/afce2e83e9fe1e7dd45974f630f3f9a18897a7da

diff --git a/staging/kde4support/KDE4SupportConfig.cmake.in b/staging/kde4s=
upport/KDE4SupportConfig.cmake.in
index efb3cc3..8265025 100644
--- a/staging/kde4support/KDE4SupportConfig.cmake.in
+++ b/staging/kde4support/KDE4SupportConfig.cmake.in
@@ -5,18 +5,5 @@ set_and_check(KDE4Support_INCLUDE_DIR    "@PACKAGE_INCLUDE=
_INSTALL_DIR@")
 =

 include("${CMAKE_CURRENT_LIST_DIR}/KDE4SupportTargets.cmake")
 =

-# the following two checks are hacks for as long as there are still cyclic=
 depndencies between kde4support and kdelibs:
-if(NOT TARGET KDE4__kdeui)
-  set( ${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
-  set( ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "KDE4Support found, bu=
t required target KDE4__kdeui, supposed to be imported earlier via find_pac=
kage(KDELibs4), does not exist !")
-  return()
-endif()
-
-if(NOT TARGET KDE4__KDE4Support)
-  set( ${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
-  set( ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "KDE4Support found, bu=
t target KDE4__KDE4Support, supposed to be imported earlier via find_packag=
e(KDELibs4), does not exist !")
-  return()
-endif()
-
 set(KDE4Support_LIBRARIES KDE4__KDE4Support)
 set(KDE4Support_INCLUDE_DIRS ${KDE4Support_INCLUDE_DIR} )
[prev in list] [next in list] [prev in thread] [next in thread]