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

List:       kde-commits
Subject:    [kdelibs/frameworks] kdecore: No KArchive dependency in kdecore.
From:       Volker Krause <vkrause () kde ! org>
Date:       2011-08-10 13:39:41
Message-ID: 20110810133941.98388A60AE () git ! kde ! org
[Download RAW message or body]

Git commit a02436614f68ec81cd8564d920a16c093af390dd by Volker Krause.
Committed on 10/08/2011 at 15:39.
Pushed by vkrause into branch 'frameworks'.

No KArchive dependency in kdecore.

M  +0    -3    kdecore/CMakeLists.txt
M  +0    -1    kdecore/localization/kcharsets.cpp

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

diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 6183b73..b8f9d3b 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -49,9 +49,6 @@ include_directories( ${KDE4_KDECORE_INCLUDES} )
 include_directories( ${ZLIB_INCLUDE_DIR} )
 include_directories( ${QT_INCLUDES} )
 
-# FIXME: temporary during frameworks split
-include_directories( ${CMAKE_SOURCE_DIR}/tier1/libkarchive ${CMAKE_BINARY_DIR}/tier1/libkarchive )
-
 if (KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
    set(KDECORE_NO_KDE3SUPPORT TRUE)
 endif(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
diff --git a/kdecore/localization/kcharsets.cpp b/kdecore/localization/kcharsets.cpp
index a136fa4..b5102a1 100644
--- a/kdecore/localization/kcharsets.cpp
+++ b/kdecore/localization/kcharsets.cpp
@@ -20,7 +20,6 @@
 */
 #include "kcharsets.h"
 
-#include "kfilterdev.h"
 #include "kentities.c"
 
 #include "kconfig.h"

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