From kde-commits  Wed Nov 10 11:55:12 2010
From: Kevin Ottens <ervin () kde ! org>
Date: Wed, 10 Nov 2010 11:55:12 +0000
To: kde-commits
Subject: KDE/kdelibs/kdecore
Message-Id: <20101110115512.796D6AC89E () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=128939016904096

SVN commit 1195114 by ervin:

Remove KLibLoader and KGenericFactory in the KDE_NO_DEPRECATED mode.


 M  +15 -4     CMakeLists.txt  


--- trunk/KDE/kdelibs/kdecore/CMakeLists.txt #1195113:1195114
@@ -349,7 +349,6 @@
    util/kdedmodule.cpp
    util/kdeversion.cpp
    util/klauncher_iface.cpp
-   util/klibloader.cpp
    util/klibrary.cpp
    util/kmacroexpander.cpp
    util/kpluginfactory.cpp
@@ -361,6 +360,12 @@
    ${kdecore_OPTIONAL_SRCS}
 )
 
+if(NOT KDE_NO_DEPRECATED)
+    set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS}
+       util/klibloader.cpp
+    )
+endif(NOT KDE_NO_DEPRECATED)
+
 if(NOT WIN32)
     set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} util/kshareddatacache.cpp)
     set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
@@ -624,10 +629,7 @@
    util/kautostart.h
    util/kde_file.h
    util/kdedmodule.h
-   util/kgenericfactory.h
-   util/kgenericfactory.tcc
    util/klauncher_iface.h
-   util/klibloader.h
    util/klibrary.h
    util/kmacroexpander.h
    util/kexportplugin.h
@@ -649,6 +651,15 @@
    DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
 )
 
+if (NOT KDE_NO_DEPRECATED)
+   install(FILES
+      util/kgenericfactory.h
+      util/kgenericfactory.tcc
+      util/klibloader.h
+      DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
+   )
+endif (NOT KDE_NO_DEPRECATED)
+
 install( FILES sonnet/backgroundchecker.h sonnet/speller.h sonnet/globals.h
          DESTINATION ${INCLUDE_INSTALL_DIR}/sonnet COMPONENT Devel)