diff --git a/kdelibs-4.1.85-parallel_devel.patch b/kdelibs-4.1.85-parallel_devel.patch index 2df6845..cb3febf 100644 --- a/kdelibs-4.1.85-parallel_devel.patch +++ b/kdelibs-4.1.85-parallel_devel.patch @@ -1,6 +1,6 @@ diff -ur kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.85-parallel_devel/cmake/modules/FindKDE4Internal.cmake --- kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake 2008-12-04 09:35:54.000000000 +0100 -+++ kdelibs-4.1.85-parallel_devel/cmake/modules/FindKDE4Internal.cmake 2008-12-14 03:24:15.000000000 +0100 ++++ kdelibs-4.1.85-parallel_devel/cmake/modules/FindKDE4Internal.cmake 2008-12-14 03:44:34.000000000 +0100 @@ -15,10 +15,10 @@ # The following variables are defined for the various tools required to # compile KDE software: @@ -53,16 +53,17 @@ diff -ur kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.85-para set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) set(KDE4_INSTALLED_VERSION_OK TRUE) -@@ -542,7 +542,7 @@ +@@ -542,7 +542,8 @@ set(KDE4_PLASMA_LIBRARY plasma ) set(KDE4_PLASMA_LIBS plasma ) - set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} ) + set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel ) ++ link_directories("${KDE4_LIB_DIR}") # kpassworddialog.h is new with KDE4 # KDE4_INCLUDE_INSTALL_DIR is defined by KDELibsDependencies.cmake -@@ -550,14 +550,14 @@ +@@ -550,14 +551,14 @@ # at first look in LIBEXEC_INSTALL_DIR and no default paths, # if this didn't succeed, the second call makes cmake search again, but in the standard paths @@ -81,7 +82,7 @@ diff -ur kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.85-para mark_as_advanced(KDE4_KCFGC_EXECUTABLE KDE4_MEINPROC_EXECUTABLE KDE4_MAKEKDEWIDGETS_EXECUTABLE) -@@ -795,9 +795,12 @@ +@@ -795,7 +796,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} "${KDE4_BIN_INSTALL_DIR}" ) @@ -90,12 +91,8 @@ diff -ur kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.85-para + ${CMAKE_SYSTEM_LIBRARY_PATH} "${KDE4_LIB_INSTALL_DIR}" ) -+link_directories("${KDE4_LIB_INSTALL_DIR}/kde4/devel") -+ # under Windows dlls may be also installed in bin/ - if(WIN32) - set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} -@@ -1185,9 +1188,9 @@ +@@ -1185,9 +1187,9 @@ endif (NOT _kdeBootStrapping) if(KDE4_KCFGC_EXECUTABLE)