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

List:       kde-commits
Subject:    [kdepim-runtime/akregator_port] krsslocal: Don't look for stuff we already found
From:       Christophe Giboudeaux <cgiboudeaux () gmx ! com>
Date:       2012-03-31 15:16:46
Message-ID: 20120331151646.F2012A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 9d02d4c798bd85b6dbef500f147de9c161920c81 by Christophe Giboudeau=
x.
Committed on 20/02/2012 at 22:53.
Pushed by osterfeld into branch 'akregator_port'.

Don't look for stuff we already found

M  +2    -43   krsslocal/CMakeLists.txt

http://commits.kde.org/kdepim-runtime/9d02d4c798bd85b6dbef500f147de9c161920=
c81

diff --git a/krsslocal/CMakeLists.txt b/krsslocal/CMakeLists.txt
index c67707c..9c8212f 100644
--- a/krsslocal/CMakeLists.txt
+++ b/krsslocal/CMakeLists.txt
@@ -1,47 +1,7 @@
 project(krsslocal)
 =

-# search packages used by KDE
-find_package (KDE4 REQUIRED)
-include(KDE4Defaults)
-include(MacroLibrary)
-include(MacroOptionalAddSubdirectory)
-include(CheckIncludeFiles)
-find_package (KdepimLibs REQUIRED)
-
-find_program(XSLTPROC_EXECUTABLE xsltproc)
-macro_log_feature(XSLTPROC_EXECUTABLE "xsltproc" "The command line XSLT pr=
ocessor from libxslt" "http://xmlsoft.org/XSLT/" FALSE "" "Needed for build=
ing Akonadi resources. Recommended.")
-
-if (XSLTPROC_EXECUTABLE)
-  # generates a D-Bus interface description from a KConfigXT file
-  macro( kcfg_generate_dbus_interface _kcfg _name )
-    add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml
-      COMMAND ${XSLTPROC_EXECUTABLE} --stringparam interfaceName ${_name}
-              ${KDEPIMLIBS_DATA_DIR}/akonadi-kde/kcfg2dbus.xsl
-              ${_kcfg}
-              > ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml
-      DEPENDS ${KDEPIMLIBS_DATA_DIR}/akonadi-kde/kcfg2dbus.xsl
-              ${_kcfg}
-    )
-  endmacro( kcfg_generate_dbus_interface )
-endif (XSLTPROC_EXECUTABLE)
-
-if(WIN32)
-    set(LIB_INSTALL_DIR ${LIB_INSTALL_DIR}
-                        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-                        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-                        ARCHIVE DESTINATION ${LIB_INSTALL_DIR} )
-endif(WIN32)
-
-set(KDE4_ICON_DIR ${KDE4_INSTALL_DIR}/share/icons)
-
-include_directories(
-    ${KDE4_INCLUDES}
-    ${KDEPIMLIBS_INCLUDE_DIRS}
-)
-
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
-
+include_directories(${krss_SOURCE_DIR})
 =

 ########### next target ###############
 =

@@ -52,8 +12,6 @@ set( krsslocalresource_SRCS
   rssitemsync.cpp
 )
 =

-install( FILES krsslocalresource.desktop DESTINATION "${CMAKE_INSTALL_PREF=
IX}/share/akonadi/agents" )
-
 kde4_add_kcfg_files(krsslocalresource_SRCS settings.kcfgc)
 kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/krsslocalresource=
.kcfg org.kde.Akonadi.RssLocal.Settings)
 qt4_add_dbus_adaptor(krsslocalresource_SRCS
@@ -65,3 +23,4 @@ kde4_add_executable(akonadi_krsslocal_resource RUN_UNINST=
ALLED ${krsslocalresour
 target_link_libraries(akonadi_krsslocal_resource ${KDE4_AKONADI_LIBS} ${QT=
_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBS} krss)
 =

 install(TARGETS akonadi_krsslocal_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
+install( FILES krsslocalresource.desktop DESTINATION "${CMAKE_INSTALL_PREF=
IX}/share/akonadi/agents" )

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