generic: generate export headers

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kioslave/network/ioslave/CMakeLists.txt b/kioslave/network/ioslave/CMakeLists.txt
index 79ea97f..fdedb1c 100644 (file)
--- a/kioslave/network/ioslave/CMakeLists.txt
+++ b/kioslave/network/ioslave/CMakeLists.txt
@@ -2,6 +2,7 @@ project( kio_network )
 
 include_directories(
   ../network
+  ${CMAKE_CURRENT_BINARY_DIR}/../network
 )
 
 set( kio_network_SRCS

diff --git a/kioslave/network/kded/CMakeLists.txt b/kioslave/network/kded/CMakeLists.txt
index 3708ef6..899fe71 100644 (file)
--- a/kioslave/network/kded/CMakeLists.txt
+++ b/kioslave/network/kded/CMakeLists.txt
@@ -2,6 +2,7 @@ project( networkwatcher )
 
 include_directories(
   ../network
+  ${CMAKE_CURRENT_BINARY_DIR}/../network
   ../ioslave
 )
 set( kded_networkwatcher_SRCS

diff --git a/kioslave/network/network/CMakeLists.txt b/kioslave/network/network/CMakeLists.txt
index 939b8ae..a243e4c 100644 (file)
--- a/kioslave/network/network/CMakeLists.txt
+++ b/kioslave/network/network/CMakeLists.txt
@@ -51,6 +51,12 @@ set( molletnetwork_LINK_LIBS
 
 add_library( molletnetwork  SHARED ${molletnetwork_LIB_SRCS} )
 target_link_libraries( molletnetwork  ${molletnetwork_LINK_LIBS} )
-set_target_properties( molletnetwork  PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+
+set_target_properties(molletnetwork PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
+
+generate_export_header(molletnetwork)
 
 install( TARGETS molletnetwork  ${INSTALL_TARGETS_DEFAULT_ARGS} )

diff --git a/kioslave/network/network/molletnetwork_export.h b/kioslave/network/network/molletnetwork_export.h
deleted file mode 100644 (file)
index 098b5a4..0000000
--- a/kioslave/network/network/molletnetwork_export.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-    This file is part of the Mollet network library, part of the KDE project.
-
-    Copyright 2009 Friedrich W. H. Kossebau <kossebau@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) version 3, or any
-    later version accepted by the membership of KDE e.V. (or its
-    successor approved by the membership of KDE e.V.), which shall
-    act as a proxy defined in Section 6 of version 3 of the license.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef MOLLETNETWORK_EXPORT_H
-#define MOLLETNETWORK_EXPORT_H
-
-// KDE
-#include <kdemacros.h>
-
-
-#ifndef MOLLETNETWORK_EXPORT
-  // building the library?
-# if defined(MAKE_MOLLETNETWORK_LIB)
-#  define MOLLETNETWORK_EXPORT KDE_EXPORT
-  // using the library
-# else
-#  define MOLLETNETWORK_EXPORT KDE_IMPORT
-# endif
-#endif
-
-# ifndef MOLLETNETWORK_EXPORT_DEPRECATED
-#  define MOLLETNETWORK_EXPORT_DEPRECATED KDE_DEPRECATED MOLLETNETWORK_EXPORT
-# endif
-
-#endif

diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt
index 9464899..63600c6 100644 (file)
--- a/krunner/CMakeLists.txt
+++ b/krunner/CMakeLists.txt
@@ -7,6 +7,8 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/libs/ksysguard
     ${CMAKE_SOURCE_DIR}/libs/ksysguard/processcore
     ${CMAKE_SOURCE_DIR}/libs/plasmagenericshell
+    # for plasmagenericshell_export.h
+    ${CMAKE_BINARY_DIR}/libs/plasmagenericshell
     # for kworkspace_export.h
     ${CMAKE_BINARY_DIR}/libs/kworkspace
 )

diff --git a/kwalletd/CMakeLists.txt b/kwalletd/CMakeLists.txt
index 887bc60..7a5e1fa 100644 (file)
--- a/kwalletd/CMakeLists.txt
+++ b/kwalletd/CMakeLists.txt
@@ -5,7 +5,10 @@ add_subdirectory(backend)
 
 ########### kwalletd ###############
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/backend)
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/backend
+    ${CMAKE_CURRENT_BINARY_DIR}/backend
+)
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=285)
 

diff --git a/kwalletd/backend/CMakeLists.txt b/kwalletd/backend/CMakeLists.txt
index 9ff592d..caddc40 100644 (file)
--- a/kwalletd/backend/CMakeLists.txt
+++ b/kwalletd/backend/CMakeLists.txt
@@ -3,7 +3,10 @@
 check_include_files(stdint.h HAVE_STDINT_H)
 check_include_files(sys/bitypes.h HAVE_SYS_BITYPES_H)
 
-configure_file (config-kwalletbackend.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwalletbackend.h )
+configure_file(
+    config-kwalletbackend.h.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/config-kwalletbackend.h
+)
 
 ########### kwalletbackend ###############
 
@@ -20,7 +23,13 @@ add_library(kwalletbackend SHARED ${kwalletbackend_LIB_SRCS})
 
 target_link_libraries(kwalletbackend ${KDE4_KDEUI_LIBS})
 
-set_target_properties(kwalletbackend PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+set_target_properties(kwalletbackend PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
+
+generate_export_header(kwalletbackend)
+
 install(TARGETS kwalletbackend ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 if(ENABLE_TESTING)

diff --git a/kwalletd/backend/blowfish.h b/kwalletd/backend/blowfish.h
index 1b752af..6b02135 100644 (file)
--- a/kwalletd/backend/blowfish.h
+++ b/kwalletd/backend/blowfish.h
@@ -31,7 +31,7 @@
 #endif
 
 #include "blockcipher.h"
-#include <kwallet_export.h>
+#include "kwalletbackend_export.h"
 
 /* @internal
  */

diff --git a/kwalletd/backend/kwallet_export.h b/kwalletd/backend/kwallet_export.h
deleted file mode 100644 (file)
index eb7be1e..0000000
--- a/kwalletd/backend/kwallet_export.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2006 David Faure <faure@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KWALLET_EXPORT_H
-#define KWALLET_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef KWALLETBACKEND_EXPORT
-# if defined(MAKE_KWALLETBACKEND_LIB)
-   /* We are building this library */
-#  define KWALLETBACKEND_EXPORT KDE_EXPORT
-# else
-   /* We are using this library */
-#  define KWALLETBACKEND_EXPORT KDE_IMPORT
-# endif
-#endif
-
-#endif

diff --git a/kwalletd/backend/kwalletbackend.h b/kwalletd/backend/kwalletbackend.h
index 21b6db2..9b16aaf 100644 (file)
--- a/kwalletd/backend/kwalletbackend.h
+++ b/kwalletd/backend/kwalletbackend.h
@@ -25,6 +25,8 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QMap>
+#include <kdemacros.h>
+
 #include "kwalletentry.h"
 #include "backendpersisthandler.h"
 

diff --git a/kwalletd/backend/kwalletentry.h b/kwalletd/backend/kwalletentry.h
index 3dd3558..751c2e6 100644 (file)
--- a/kwalletd/backend/kwalletentry.h
+++ b/kwalletd/backend/kwalletentry.h
@@ -25,7 +25,7 @@
 #include <QtCore/QString>
 #include <QtCore/QDataStream>
 
-#include "kwallet_export.h"
+#include "kwalletbackend_export.h"
 #include "kwallet.h"
 
 namespace KWallet {

diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index ead3184..ed4c689 100644 (file)
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -1,3 +1,8 @@
+include_directories(
+    # for taskmanager_export.h
+    ${CMAKE_BINARY_DIR}/libs
+)
+
 add_subdirectory(kephal)
 add_subdirectory(kworkspace)
 add_subdirectory(oxygen)

diff --git a/libs/plasmaclock/CMakeLists.txt b/libs/plasmaclock/CMakeLists.txt
index c57f3b0..05b147b 100644 (file)
--- a/libs/plasmaclock/CMakeLists.txt
+++ b/libs/plasmaclock/CMakeLists.txt
@@ -21,9 +21,15 @@ set_target_properties(plasmaclock PROPERTIES
     SOVERSION ${GENERIC_LIB_SOVERSION}
 )
 
+generate_export_header(plasmaclock)
+
 #clockapplet.h
 install(
-    FILES clockapplet.h calendar.h calendartable.h plasmaclock_export.h
+    FILES
+    clockapplet.h
+    calendar.h
+    calendartable.h
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmaclock_export.h
     DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasmaclock
     COMPONENT Devel
 )

diff --git a/libs/plasmaclock/plasmaclock_export.h b/libs/plasmaclock/plasmaclock_export.h
deleted file mode 100644 (file)
index 95ad600..0000000
--- a/libs/plasmaclock/plasmaclock_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2007 David Faure <faure@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef PLASMACLOCK_EXPORT_H
-#define PLASMACLOCK_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef PLASMACLOCK_EXPORT
-# if defined(MAKE_PLASMACLOCK_LIB)
-   /* We are building this library */ 
-#  define PLASMACLOCK_EXPORT KDE_EXPORT
-# else
-   /* We are using this library */ 
-#  define PLASMACLOCK_EXPORT KDE_IMPORT
-# endif
-#endif
-
-# ifndef PLASMACLOCK_EXPORT_DEPRECATED
-#  define PLASMACLOCK_EXPORT_DEPRECATED KDE_DEPRECATED PLASMACLOCK_EXPORT
-# endif
-
-#endif

diff --git a/libs/plasmagenericshell/CMakeLists.txt b/libs/plasmagenericshell/CMakeLists.txt
index 18e31d3..8923416 100644 (file)
--- a/libs/plasmagenericshell/CMakeLists.txt
+++ b/libs/plasmagenericshell/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_directories(
-   # for kworkspace_export.h
-   ${CMAKE_BINARY_DIR}/libs/kworkspace
+    ${CMAKE_CURRENT_BINARY_DIR}
+    # for kworkspace_export.h
+    ${CMAKE_BINARY_DIR}/libs/kworkspace
 )
 
 if(ENABLE_TESTING)
@@ -61,6 +62,8 @@ set_target_properties(plasmagenericshell PROPERTIES
     SOVERSION ${GENERIC_LIB_SOVERSION}
 )
 
+generate_export_header(plasmagenericshell)
+
 install(DIRECTORY widgetsexplorer/package/
         DESTINATION ${KDE4_DATA_INSTALL_DIR}/plasma/packages/org.kde.desktop.widgetexplorer
         PATTERN "Messages.sh" EXCLUDE

diff --git a/libs/plasmagenericshell/plasmagenericshell_export.h b/libs/plasmagenericshell/plasmagenericshell_export.h
deleted file mode 100644 (file)
index 45d2010..0000000
--- a/libs/plasmagenericshell/plasmagenericshell_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2007 David Faure <faure@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef PLASMAGENERICSHELL_EXPORT_H
-#define PLASMAGENERICSHELL_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef PLASMAGENERICSHELL_EXPORT
-# if defined(MAKE_PLASMAGENERICSHELL_LIB)
-   /* We are building this library */ 
-#  define PLASMAGENERICSHELL_EXPORT KDE_EXPORT
-# else
-   /* We are using this library */ 
-#  define PLASMAGENERICSHELL_EXPORT KDE_IMPORT
-# endif
-#endif
-
-# ifndef PLASMAGENERICSHELL_EXPORT_DEPRECATED
-#  define PLASMAGENERICSHELL_EXPORT_DEPRECATED KDE_DEPRECATED PLASMAGENERICSHELL_EXPORT
-# endif
-
-#endif

diff --git a/libs/plasmagenericshell/scripting/appinterface.h b/libs/plasmagenericshell/scripting/appinterface.h
index 24b2191..4ae82b3 100644 (file)
--- a/libs/plasmagenericshell/scripting/appinterface.h
+++ b/libs/plasmagenericshell/scripting/appinterface.h
@@ -24,7 +24,7 @@
 #include <QtCore/qrect.h>
 #include <QStringList>
 
-#include "../plasmagenericshell_export.h"
+#include "plasmagenericshell_export.h"
 
 namespace Plasma
 {

diff --git a/libs/plasmagenericshell/scripting/applet.h b/libs/plasmagenericshell/scripting/applet.h
index c07a104..99e900e 100644 (file)
--- a/libs/plasmagenericshell/scripting/applet.h
+++ b/libs/plasmagenericshell/scripting/applet.h
@@ -25,7 +25,7 @@
 
 #include <KConfigGroup>
 
-#include "../plasmagenericshell_export.h"
+#include "plasmagenericshell_export.h"
 
 namespace Plasma
 {

diff --git a/libs/plasmagenericshell/scripting/containment.h b/libs/plasmagenericshell/scripting/containment.h
index 4f46923..595c63f 100644 (file)
--- a/libs/plasmagenericshell/scripting/containment.h
+++ b/libs/plasmagenericshell/scripting/containment.h
@@ -26,7 +26,7 @@
 
 #include "applet.h"
 
-#include "../plasmagenericshell_export.h"
+#include "plasmagenericshell_export.h"
 
 namespace Plasma
 {

diff --git a/libs/plasmagenericshell/scripting/layouttemplatepackagestructure.h b/libs/plasmagenericshell/scripting/layouttemplatepackagestructure.h
index b9d3328..820119a 100644 (file)
--- a/libs/plasmagenericshell/scripting/layouttemplatepackagestructure.h
+++ b/libs/plasmagenericshell/scripting/layouttemplatepackagestructure.h
@@ -21,7 +21,8 @@
 #define TEMPLATETEMPLATEPACKAGE_H
 
 #include <Plasma/PackageStructure>
-#include "../plasmagenericshell_export.h"
+
+#include "plasmagenericshell_export.h"
 
 namespace WorkspaceScripting
 {

diff --git a/libs/plasmagenericshell/scripting/scriptengine.h b/libs/plasmagenericshell/scripting/scriptengine.h
index 6d999fd..49d607b 100644 (file)
--- a/libs/plasmagenericshell/scripting/scriptengine.h
+++ b/libs/plasmagenericshell/scripting/scriptengine.h
@@ -23,7 +23,7 @@
 #include <QScriptEngine>
 #include <QScriptValue>
 
-#include "../plasmagenericshell_export.h"
+#include "plasmagenericshell_export.h"
 
 namespace Plasma
 {

diff --git a/libs/plasmagenericshell/scripting/widget.h b/libs/plasmagenericshell/scripting/widget.h
index 1db7cb6..87f7387 100644 (file)
--- a/libs/plasmagenericshell/scripting/widget.h
+++ b/libs/plasmagenericshell/scripting/widget.h
@@ -24,7 +24,7 @@
 
 #include "applet.h"
 
-#include "../plasmagenericshell_export.h"
+#include "plasmagenericshell_export.h"
 
 namespace Plasma
 {

diff --git a/libs/taskmanager/CMakeLists.txt b/libs/taskmanager/CMakeLists.txt
index 5e6d7e1..97fa18a 100644 (file)
--- a/libs/taskmanager/CMakeLists.txt
+++ b/libs/taskmanager/CMakeLists.txt
@@ -45,25 +45,27 @@ set_target_properties(taskmanager PROPERTIES
     SOVERSION ${GENERIC_LIB_SOVERSION}
 )
 
+generate_export_header(taskmanager)
+
 install(
     TARGETS taskmanager
     EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
-   abstractgroupableitem.h
-   abstractgroupingstrategy.h
-   abstractsortingstrategy.h
-   groupmanager.h
-   launcheritem.h
-   startup.h
-   task.h
-   taskactions.h
-   taskgroup.h
-   taskitem.h
-   taskmanager.h
-   taskmanager_export.h
-   DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/taskmanager COMPONENT Devel
+    abstractgroupableitem.h
+    abstractgroupingstrategy.h
+    abstractsortingstrategy.h
+    groupmanager.h
+    launcheritem.h
+    startup.h
+    task.h
+    taskactions.h
+    taskgroup.h
+    taskitem.h
+    taskmanager.h
+    ${CMAKE_CURRENT_BINARY_DIR}/taskmanager_export.h
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/taskmanager COMPONENT Devel
 )
 
 

diff --git a/libs/taskmanager/taskitem.h b/libs/taskmanager/taskitem.h
index 35606e2..2f46077 100644 (file)
--- a/libs/taskmanager/taskitem.h
+++ b/libs/taskmanager/taskitem.h
@@ -24,6 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef TASKITEM_H
 #define TASKITEM_H
 
+#include <kdemacros.h>
 #include <taskmanager/abstractgroupableitem.h>
 #include <taskmanager/startup.h>
 #include <taskmanager/task.h>

diff --git a/libs/taskmanager/taskmanager_export.h b/libs/taskmanager/taskmanager_export.h
deleted file mode 100644 (file)
index b0b0f0d..0000000
--- a/libs/taskmanager/taskmanager_export.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************
-
-Copyright 2008 Aaron Seigo <aseigo@kde.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-******************************************************************/
-
-
-#ifndef TASKMANAGER_EXPORT_H
-#define TASKMANAGER_EXPORT_H
-
-/* needed for TASKMANAGER_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef TASKMANAGER_EXPORT
-# if defined(MAKE_TASKMANAGER_LIB)
-/* We are building this library */
-#  define TASKMANAGER_EXPORT KDE_EXPORT
-# else
-/* We are using this library */
-#  define TASKMANAGER_EXPORT KDE_IMPORT
-# endif
-#endif
-
-# ifndef TASKMANAGER_EXPORT_DEPRECATED
-#  define TASKMANAGER_EXPORT_DEPRECATED KDE_DEPRECATED TASKMANAGER_EXPORT
-# endif
-
-#endif

diff --git a/plasma/applets/analog-clock/CMakeLists.txt b/plasma/applets/analog-clock/CMakeLists.txt
index 65bb95c..67aabf8 100644 (file)
--- a/plasma/applets/analog-clock/CMakeLists.txt
+++ b/plasma/applets/analog-clock/CMakeLists.txt
@@ -1,3 +1,7 @@
+include_directories(
+    # for plasmaclock_export.h
+    ${CMAKE_BINARY_DIR}/libs/plasmaclock
+)
 
 set(clock_SRCS
     clock.cpp
@@ -5,7 +9,11 @@ set(clock_SRCS
 )
 
 kde4_add_plugin(plasma_applet_clock ${clock_SRCS})
-target_link_libraries(plasma_applet_clock ${KDE4_PLASMA_LIBS} plasmaclock ${KDE4_KIO_LIBS})
+target_link_libraries(plasma_applet_clock
+    ${KDE4_PLASMA_LIBS}
+    ${KDE4_KIO_LIBS}
+    plasmaclock
+)
 
 install(TARGETS plasma_applet_clock DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-applet-analogclock.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})

diff --git a/plasma/applets/calendar/CMakeLists.txt b/plasma/applets/calendar/CMakeLists.txt
index 4c41e12..c6a3a1d 100644 (file)
--- a/plasma/applets/calendar/CMakeLists.txt
+++ b/plasma/applets/calendar/CMakeLists.txt
@@ -1,12 +1,21 @@
 project(plasma-applet-calendar)
 
+include_directories(
+    # for plasmaclock_export.h
+    ${CMAKE_BINARY_DIR}/libs/plasmaclock
+)
+
 set(calendar_SRCS
     calendar.cpp)
 
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
 kde4_add_plugin(plasma_applet_calendar ${calendar_SRCS})
-target_link_libraries(plasma_applet_calendar ${KDE4_PLASMA_LIBS} plasmaclock ${KDE4_KIO_LIBS})
+target_link_libraries(plasma_applet_calendar
+    ${KDE4_PLASMA_LIBS}
+    ${KDE4_KIO_LIBS}
+    plasmaclock
+)
 
 install(TARGETS plasma_applet_calendar DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-applet-calendar.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})

diff --git a/plasma/applets/digital-clock/CMakeLists.txt b/plasma/applets/digital-clock/CMakeLists.txt
index 461fca0..d8ffcac 100644 (file)
--- a/plasma/applets/digital-clock/CMakeLists.txt
+++ b/plasma/applets/digital-clock/CMakeLists.txt
@@ -1,5 +1,10 @@
 project(plasma-dig-clock)
 
+include_directories(
+    # for plasmaclock_export.h
+    ${CMAKE_BINARY_DIR}/libs/plasmaclock
+)
+
 set(clock_SRCS
     clock.cpp
     clockConfig.ui
@@ -7,10 +12,11 @@ set(clock_SRCS
 
 kde4_add_plugin(plasma_applet_dig_clock ${clock_SRCS})
 target_link_libraries(plasma_applet_dig_clock
-                      ${KDE4_PLASMA_LIBS}
-                      plasmaclock
-                      ${KDE4_KDEUI_LIBS}
-                      ${KDE4_KIO_LIBS})
+    ${KDE4_PLASMA_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KIO_LIBS}
+    plasmaclock
+)
 
 install(TARGETS plasma_applet_dig_clock DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-applet-digitalclock.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})

diff --git a/plasma/applets/kickoff/CMakeLists.txt b/plasma/applets/kickoff/CMakeLists.txt
index 29c6816..7d00c51 100644 (file)
--- a/plasma/applets/kickoff/CMakeLists.txt
+++ b/plasma/applets/kickoff/CMakeLists.txt
@@ -1,6 +1,10 @@
 #######################################################################################
 # Kickoff Library
 
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 set(libkickoff_SRCS
     core/kickoffmodel.cpp
     core/kickoffabstractmodel.cpp
@@ -31,6 +35,9 @@ set(Kickoff_LIBS ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_LIBS} kworkspa
 
 add_library(kickoff SHARED ${libkickoff_SRCS})
 target_link_libraries(kickoff ${KDE4_PLASMA_LIBS} ${Kickoff_LIBS})
+
+generate_export_header(kickoff)
+
 install(TARGETS kickoff ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 #######################################################################################

diff --git a/plasma/applets/kickoff/core/applicationmodel.h b/plasma/applets/kickoff/core/applicationmodel.h
index e3dfead..51c5b1a 100644 (file)
--- a/plasma/applets/kickoff/core/applicationmodel.h
+++ b/plasma/applets/kickoff/core/applicationmodel.h
@@ -21,7 +21,7 @@
 #ifndef APPLICATIONMODEL_H
 #define APPLICATIONMODEL_H
 
-#include "core/kickoff_export.h"
+#include "kickoff_export.h"
 #include "core/kickoffabstractmodel.h"
 #include "core/models.h"
 

diff --git a/plasma/applets/kickoff/core/favoritesmodel.h b/plasma/applets/kickoff/core/favoritesmodel.h
index 8ee3e9a..d604493 100644 (file)
--- a/plasma/applets/kickoff/core/favoritesmodel.h
+++ b/plasma/applets/kickoff/core/favoritesmodel.h
@@ -20,7 +20,7 @@
 #ifndef FAVORITESMODEL_H
 #define FAVORITESMODEL_H
 
-#include "core/kickoff_export.h"
+#include "kickoff_export.h"
 #include "core/kickoffmodel.h"
 #include "core/models.h"
 

diff --git a/plasma/applets/kickoff/core/itemhandlers.h b/plasma/applets/kickoff/core/itemhandlers.h
index ec72cbe..7f0d3d8 100644 (file)
--- a/plasma/applets/kickoff/core/itemhandlers.h
+++ b/plasma/applets/kickoff/core/itemhandlers.h
@@ -22,7 +22,7 @@
 
 #include <QtCore/QObject>
 
-#include "core/kickoff_export.h"
+#include "kickoff_export.h"
 #include "core/urlitemlauncher.h"
 
 namespace Kickoff

diff --git a/plasma/applets/kickoff/core/kickoff_export.h b/plasma/applets/kickoff/core/kickoff_export.h
deleted file mode 100644 (file)
index ccbfbd2..0000000
--- a/plasma/applets/kickoff/core/kickoff_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2009 Sebastian Sauer <mail@dipe.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KICKOFF_EXPORT_H
-#define KICKOFF_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef KICKOFF_EXPORT
-# if defined(MAKE_KICKOFF_LIB)
-   /* We are building this library */ 
-#  define KICKOFF_EXPORT KDE_EXPORT
-# else
-   /* We are using this library */ 
-#  define KICKOFF_EXPORT KDE_IMPORT
-# endif
-#endif
-
-# ifndef KICKOFF_EXPORT_DEPRECATED
-#  define KICKOFF_EXPORT_DEPRECATED KDE_DEPRECATED KICKOFF_EXPORT
-# endif
-
-#endif

diff --git a/plasma/applets/kickoff/core/krunnermodel.h b/plasma/applets/kickoff/core/krunnermodel.h
index 93a8b15..5e013cf 100644 (file)
--- a/plasma/applets/kickoff/core/krunnermodel.h
+++ b/plasma/applets/kickoff/core/krunnermodel.h
@@ -20,8 +20,8 @@
 #ifndef KRUNNERMODEL_H
 #define KRUNNERMODEL_H
 
+#include "kickoff_export.h"
 #include "core/models.h"
-#include "core/kickoff_export.h"
 #include "core/kickoffmodel.h"
 #include "core/urlitemlauncher.h"
 

diff --git a/plasma/applets/kickoff/core/leavemodel.h b/plasma/applets/kickoff/core/leavemodel.h
index 0676fb9..8cd83b7 100644 (file)
--- a/plasma/applets/kickoff/core/leavemodel.h
+++ b/plasma/applets/kickoff/core/leavemodel.h
@@ -20,7 +20,7 @@
 #ifndef LEAVEMODEL_H
 #define LEAVEMODEL_H
 
-#include "core/kickoff_export.h"
+#include "kickoff_export.h"
 
 #include <QStandardItemModel>
 

diff --git a/plasma/applets/kickoff/core/recentapplications.h b/plasma/applets/kickoff/core/recentapplications.h
index a0feddc..7d37f8c 100644 (file)
--- a/plasma/applets/kickoff/core/recentapplications.h
+++ b/plasma/applets/kickoff/core/recentapplications.h
@@ -20,7 +20,7 @@
 #ifndef RECENTAPPLICATIONS_H
 #define RECENTAPPLICATIONS_H
 
-#include "core/kickoff_export.h"
+#include "kickoff_export.h"
 
 // Qt
 #include <QtCore/QObject>

diff --git a/plasma/applets/kickoff/core/recentlyusedmodel.h b/plasma/applets/kickoff/core/recentlyusedmodel.h
index 841eb2b..8a23385 100644 (file)
--- a/plasma/applets/kickoff/core/recentlyusedmodel.h
+++ b/plasma/applets/kickoff/core/recentlyusedmodel.h
@@ -20,8 +20,7 @@
 #ifndef RECENTLYUSEDMODEL_H
 #define RECENTLYUSEDMODEL_H
 
-// Qt
-#include "core/kickoff_export.h"
+#include "kickoff_export.h"
 #include "core/kickoffmodel.h"
 #include "core/models.h"
 

diff --git a/plasma/applets/kickoff/core/systemmodel.h b/plasma/applets/kickoff/core/systemmodel.h
index 3d7d6e1..cde6edf 100644 (file)
--- a/plasma/applets/kickoff/core/systemmodel.h
+++ b/plasma/applets/kickoff/core/systemmodel.h
@@ -21,7 +21,7 @@
 #ifndef SYSTEMMODEL_H
 #define SYSTEMMODEL_H
 
-#include "core/kickoff_export.h"
+#include "kickoff_export.h"
 #include "core/kickoffproxymodel.h"
 
 #include <QThread>

diff --git a/plasma/applets/kickoff/core/urlitemlauncher.h b/plasma/applets/kickoff/core/urlitemlauncher.h
index c27aca0..4e2a186 100644 (file)
--- a/plasma/applets/kickoff/core/urlitemlauncher.h
+++ b/plasma/applets/kickoff/core/urlitemlauncher.h
@@ -21,12 +21,13 @@
 #ifndef URLITEMLAUNCHER_H
 #define URLITEMLAUNCHER_H
 
-#include "core/kickoff_export.h"
+#include "kickoff_export.h"
 
 #include <QObject>
+#include <QModelIndex>
 #include <solid/storageaccess.h>
 
-#include <QModelIndex>
+
 class KUrl;
 
 namespace Kickoff

diff --git a/plasma/applets/pager/CMakeLists.txt b/plasma/applets/pager/CMakeLists.txt
index bd2aad8..9b04e4a 100644 (file)
--- a/plasma/applets/pager/CMakeLists.txt
+++ b/plasma/applets/pager/CMakeLists.txt
@@ -1,5 +1,11 @@
 project(plasma-pager)
 
+include_directories(
+    # for taskmanager_export.h
+    ${CMAKE_BINARY_DIR}/libs
+    ${CMAKE_BINARY_DIR}/libs/taskmanager
+)
+
 set(pager_SRCS
     model.cpp
     pager.cpp
@@ -8,11 +14,12 @@ set(pager_SRCS
 
 kde4_add_plugin(plasma_applet_pager ${pager_SRCS})
 target_link_libraries(plasma_applet_pager
-                      ${KDE4_KIO_LIBS}
-                      ${KDE4_PLASMA_LIBS}
-                      ${KDE4_KCMUTILS_LIBS}
-                      ${QT_QTDECLARATIVE_LIBRARY}
-                      taskmanager)
+    ${KDE4_KIO_LIBS}
+    ${KDE4_PLASMA_LIBS}
+    ${KDE4_KCMUTILS_LIBS}
+    ${QT_QTDECLARATIVE_LIBRARY}
+    taskmanager
+)
 
 install(TARGETS plasma_applet_pager DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-pager-default.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})

diff --git a/plasma/applets/system-monitor/CMakeLists.txt b/plasma/applets/system-monitor/CMakeLists.txt
index d149991..e1e3279 100644 (file)
--- a/plasma/applets/system-monitor/CMakeLists.txt
+++ b/plasma/applets/system-monitor/CMakeLists.txt
@@ -8,9 +8,19 @@ set(lib_SRCS
     applet.cpp
     plotter.cpp
 )
+
 add_library(plasma_applet-system-monitor SHARED ${lib_SRCS})
-target_link_libraries(plasma_applet-system-monitor ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
-set_target_properties(plasma_applet-system-monitor PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+target_link_libraries(plasma_applet-system-monitor
+    ${KDE4_PLASMA_LIBS}
+    ${KDE4_KDEUI_LIBS}
+)
+
+set_target_properties(plasma_applet-system-monitor PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
+
+generate_export_header(plasma_applet-system-monitor BASE_NAME plasma_applet_system_monitor)
 
 # HDD Space Monitor
 
@@ -86,10 +96,12 @@ kde4_add_plugin(plasma_applet_system-monitor ${system-monitor_SRCS})
 target_link_libraries(plasma_applet_system-monitor ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} plasma_applet-system-monitor)
 
 # Install
-install(TARGETS
-    plasma_applet-system-monitor
-    ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(TARGETS
+install(
+    TARGETS plasma_applet-system-monitor
+    ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+install(
+    TARGETS
     plasma_applet_sm_hdd_activity
     plasma_applet_sm_hdd
     plasma_applet_sm_temperature
@@ -98,8 +110,10 @@ install(TARGETS
     plasma_applet_sm_cpu
     plasma_applet_sm_ram
     plasma_applet_system-monitor
-    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
-install(FILES
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
+)
+install(
+    FILES
     plasma-applet-sm_hdd_activity.desktop
     plasma-applet-sm_hdd.desktop
     plasma-applet-sm_temperature.desktop
@@ -108,7 +122,9 @@ install(FILES
     plasma-applet-sm_cpu.desktop
     plasma-applet-sm_ram.desktop
     plasma-applet-system-monitor.desktop
-    DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
-install(FILES
-    hdd_panel.svgz
-    DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/system-monitor/)
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
+)
+install(
+    FILES hdd_panel.svgz
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/system-monitor/
+)

diff --git a/plasma/applets/system-monitor/applet.h b/plasma/applets/system-monitor/applet.h
index 98d8cac..6883e24 100644 (file)
--- a/plasma/applets/system-monitor/applet.h
+++ b/plasma/applets/system-monitor/applet.h
@@ -22,7 +22,7 @@
 
 #include <Plasma/Applet>
 
-#include "sm_export.h"
+#include "plasma_applet_system_monitor_export.h"
 
 #define MINIMUM 24
 #define PREFERRED 200
@@ -37,7 +37,7 @@ namespace Plasma {
 
 namespace SM {
 
-class SM_EXPORT Applet : public Plasma::Applet
+class PLASMA_APPLET_SYSTEM_MONITOR_EXPORT Applet : public Plasma::Applet
 {
     Q_OBJECT
     public:

diff --git a/plasma/applets/system-monitor/monitorbutton.h b/plasma/applets/system-monitor/monitorbutton.h
index fba0fb9..38f087f 100644 (file)
--- a/plasma/applets/system-monitor/monitorbutton.h
+++ b/plasma/applets/system-monitor/monitorbutton.h
@@ -21,9 +21,9 @@
 #define MONITORBUTTON_HEADER
 
 #include <Plasma/PushButton>
-#include "sm_export.h"
+#include "plasma_applet_system_monitor_export.h"
 
-class SM_EXPORT MonitorButton : public Plasma::PushButton
+class PLASMA_APPLET_SYSTEM_MONITOR_EXPORT MonitorButton : public Plasma::PushButton
 {
     Q_OBJECT
     Q_PROPERTY(QString image READ image WRITE setImage)

diff --git a/plasma/applets/system-monitor/monitoricon.h b/plasma/applets/system-monitor/monitoricon.h
index e94f546..c77d6f9 100644 (file)
--- a/plasma/applets/system-monitor/monitoricon.h
+++ b/plasma/applets/system-monitor/monitoricon.h
@@ -21,9 +21,9 @@
 #define MONITORICON_HEADER
 
 #include <QGraphicsWidget>
-#include "sm_export.h"
+#include "plasma_applet_system_monitor_export.h"
 
-class SM_EXPORT MonitorIcon : public QGraphicsWidget
+class PLASMA_APPLET_SYSTEM_MONITOR_EXPORT MonitorIcon : public QGraphicsWidget
 {
     Q_OBJECT
     Q_PROPERTY(QString image READ image WRITE setImage)

diff --git a/plasma/applets/system-monitor/plotter.h b/plasma/applets/system-monitor/plotter.h
index f6aa7e4..1d5c1fa 100644 (file)
--- a/plasma/applets/system-monitor/plotter.h
+++ b/plasma/applets/system-monitor/plotter.h
@@ -21,7 +21,7 @@
 
 #include <QGraphicsWidget>
 
-#include "sm_export.h"
+#include "plasma_applet_system_monitor_export.h"
 
 #include <QGraphicsLinearLayout>
 
@@ -33,7 +33,7 @@ namespace Plasma {
 
 namespace SM {
 
-class SM_EXPORT Plotter : public QGraphicsWidget
+class PLASMA_APPLET_SYSTEM_MONITOR_EXPORT Plotter : public QGraphicsWidget
 {
         Q_OBJECT
     public:

diff --git a/plasma/applets/system-monitor/sm_export.h b/plasma/applets/system-monitor/sm_export.h
deleted file mode 100644 (file)
index a802a7d..0000000
--- a/plasma/applets/system-monitor/sm_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2007 David Faure <faure@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef SM_EXPORT_H
-#define SM_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef SM_EXPORT
-# if defined(MAKE_PLASMA_APPLET_SYSTEM_MONITOR_LIB)
-   /* We are building this library */ 
-#  define SM_EXPORT KDE_EXPORT
-# else
-   /* We are using this library */ 
-#  define SM_EXPORT KDE_IMPORT
-# endif
-#endif
-
-# ifndef SM_EXPORT_DEPRECATED
-#  define SM_EXPORT_DEPRECATED KDE_DEPRECATED SM_EXPORT
-# endif
-
-#endif

diff --git a/plasma/applets/tasks/CMakeLists.txt b/plasma/applets/tasks/CMakeLists.txt
index c191f0d..5c0da86 100644 (file)
--- a/plasma/applets/tasks/CMakeLists.txt
+++ b/plasma/applets/tasks/CMakeLists.txt
@@ -1,5 +1,11 @@
 project(plasma-tasks)
 
+include_directories(
+    # for taskmanager_export.h
+    ${CMAKE_BINARY_DIR}/libs
+    ${CMAKE_BINARY_DIR}/libs/taskmanager
+)
+
 set(tasks_SRCS
     tasks.cpp
     support/draghelper.cpp
@@ -11,7 +17,12 @@ set(tasks_SRCS
 
 kde4_add_plugin(plasma_applet_tasks ${tasks_SRCS})
 
-target_link_libraries(plasma_applet_tasks ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTDECLARATIVE_LIBRARY} taskmanager)
+target_link_libraries(plasma_applet_tasks
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_PLASMA_LIBS}
+    ${QT_QTDECLARATIVE_LIBRARY}
+    taskmanager
+)
 
 install(TARGETS plasma_applet_tasks DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-tasks-default.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})

diff --git a/plasma/applets/windowlist/CMakeLists.txt b/plasma/applets/windowlist/CMakeLists.txt
index 9bdcfdd..9f8993b 100644 (file)
--- a/plasma/applets/windowlist/CMakeLists.txt
+++ b/plasma/applets/windowlist/CMakeLists.txt
@@ -1,14 +1,20 @@
 project(plasma-windowlist)
 
+include_directories(
+    # for taskmanager_export.h
+    ${CMAKE_BINARY_DIR}/libs
+    ${CMAKE_BINARY_DIR}/libs/taskmanager
+)
+
 set(windowlist_SRCS WindowList.cpp)
 
 kde4_add_plugin(plasma_applet_windowlist ${windowlist_SRCS})
 target_link_libraries(plasma_applet_windowlist
-                      ${KDE4_PLASMA_LIBS}
-                      ${KDE4_KDEUI_LIBS}
-                      taskmanager
-                      kworkspace
-                      )
+    ${KDE4_PLASMA_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    taskmanager
+    kworkspace
+)
 
 install(TARGETS plasma_applet_windowlist DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-applet-windowlist.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})

diff --git a/plasma/dataengines/geolocation/CMakeLists.txt b/plasma/dataengines/geolocation/CMakeLists.txt
index bc93e4c..d34ea29 100644 (file)
--- a/plasma/dataengines/geolocation/CMakeLists.txt
+++ b/plasma/dataengines/geolocation/CMakeLists.txt
@@ -4,18 +4,27 @@ project(geolocation)
 
 set(plasma_geolocation_interface_SRCS geolocationprovider.cpp)
 add_library(plasma-geolocation-interface SHARED ${plasma_geolocation_interface_SRCS})
-target_link_libraries(plasma-geolocation-interface PRIVATE ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS})
-target_link_libraries(plasma-geolocation-interface
-                      PUBLIC ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS})
+target_link_libraries(plasma-geolocation-interface PUBLIC
+    ${KDE4_KIO_LIBS}
+    ${KDE4_PLASMA_LIBS}
+)
+
 set_target_properties(plasma-geolocation-interface PROPERTIES
    VERSION ${GENERIC_LIB_VERSION}
    SOVERSION ${GENERIC_LIB_SOVERSION}
 )
+
+generate_export_header(plasma-geolocation-interface BASE_NAME geolocation)
+
 install(TARGETS plasma-geolocation-interface ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-install(FILES geolocationprovider.h geolocation_export.h
-        DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasma/geolocation
-        COMPONENT Devel)
+install(
+    FILES
+    geolocationprovider.h
+    ${CMAKE_CURRENT_BINARY_DIR}/geolocation_export.h
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasma/geolocation
+    COMPONENT Devel
+)
 
 #install(FILES includes/Interface
 #        DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/KDE/Plasma/Geolocation
@@ -29,7 +38,8 @@ target_link_libraries(plasma_engine_geolocation
     ${KDE4_PLASMA_LIBS}
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KIO_LIBS}
-    ${KDE4_SOLID_LIBS})
+    ${KDE4_SOLID_LIBS}
+)
 
 install(TARGETS plasma_engine_geolocation DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-dataengine-geolocation.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})

diff --git a/plasma/dataengines/geolocation/geolocation_export.h b/plasma/dataengines/geolocation/geolocation_export.h
deleted file mode 100644 (file)
index c8df298..0000000
--- a/plasma/dataengines/geolocation/geolocation_export.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2007 David Faure <faure@kde.org>
-    Copyright (C) 2009 Petri Damsten <damu@iki.fi>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef GEOLOCATION_EXPORT_H
-#define GEOLOCATION_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef GEOLOCATION_EXPORT
-# if defined(MAKE_PLASMA_GEOLOCATION_INTERFACE_LIB)
-/* We are building this library */
-#  define GEOLOCATION_EXPORT KDE_EXPORT
-# else
-/* We are using this library */
-#  define GEOLOCATION_EXPORT KDE_IMPORT
-# endif
-#endif
-
-# ifndef GEOLOCATION_EXPORT_DEPRECATED
-#  define GEOLOCATION_EXPORT_DEPRECATED KDE_DEPRECATED GEOLOCATION_EXPORT
-# endif
-
-#endif

diff --git a/plasma/dataengines/tasks/CMakeLists.txt b/plasma/dataengines/tasks/CMakeLists.txt
index 21c0cd1..0bc8076 100644 (file)
--- a/plasma/dataengines/tasks/CMakeLists.txt
+++ b/plasma/dataengines/tasks/CMakeLists.txt
@@ -1,3 +1,9 @@
+include_directories(
+    # for taskmanager_export.h
+    ${CMAKE_BINARY_DIR}/libs
+    ${CMAKE_BINARY_DIR}/libs/taskmanager
+)
+
 set(tasks_engine_SRCS
     tasksengine.cpp
     tasksource.cpp
@@ -7,7 +13,11 @@ set(tasks_engine_SRCS
 )
 
 kde4_add_plugin(plasma_engine_tasks ${tasks_engine_SRCS})
-target_link_libraries(plasma_engine_tasks ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} taskmanager)
+target_link_libraries(plasma_engine_tasks
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_PLASMA_LIBS}
+    taskmanager
+)
 
 install(TARGETS plasma_engine_tasks DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-dataengine-tasks.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})

diff --git a/plasma/dataengines/weather/CMakeLists.txt b/plasma/dataengines/weather/CMakeLists.txt
index 846f48a..1b0ccb5 100644 (file)
--- a/plasma/dataengines/weather/CMakeLists.txt
+++ b/plasma/dataengines/weather/CMakeLists.txt
@@ -1,3 +1,8 @@
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}/ions
+)
+
+
 ADD_SUBDIRECTORY(ions)
 
 SET(weather_SRCS weatherengine.cpp)

diff --git a/plasma/dataengines/weather/ions/CMakeLists.txt b/plasma/dataengines/weather/ions/CMakeLists.txt
index d5e32e6..bfb3a5b 100644 (file)
--- a/plasma/dataengines/weather/ions/CMakeLists.txt
+++ b/plasma/dataengines/weather/ions/CMakeLists.txt
@@ -1,6 +1,6 @@
 # the Ion shared library
 set(ionlib_SRCS ion.cpp)
-add_library (weather_ion SHARED ${ionlib_SRCS})
+add_library(weather_ion SHARED ${ionlib_SRCS})
 target_link_libraries(weather_ion PUBLIC
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KIO_LIBS}
@@ -12,6 +12,8 @@ set_target_properties(weather_ion PROPERTIES
     SOVERSION ${GENERIC_LIB_SOVERSION}
 )
 
+generate_export_header(weather_ion BASE_NAME ion)
+
 install(
     TARGETS weather_ion
     EXPORT kdeworkspaceLibraryTargets
@@ -19,7 +21,9 @@ install(
 )
 
 install(
-    FILES ion.h ion_export.h
+    FILES
+    ion.h
+    ${CMAKE_CURRENT_BINARY_DIR}/ion_export.h
     DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasma/weather
     COMPONENT Devel
 )

diff --git a/plasma/dataengines/weather/ions/ion_export.h b/plasma/dataengines/weather/ions/ion_export.h
deleted file mode 100644 (file)
index d7f201a..0000000
--- a/plasma/dataengines/weather/ions/ion_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2007 David Faure <faure@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef ION_EXPORT_H
-#define ION_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef ION_EXPORT
-# if defined(MAKE_WEATHER_ION_LIB)
-/* We are building this library */
-#  define ION_EXPORT KDE_EXPORT
-# else
-/* We are using this library */
-#  define ION_EXPORT KDE_IMPORT
-# endif
-#endif
-
-# ifndef ION_EXPORT_DEPRECATED
-#  define ION_EXPORT_DEPRECATED KDE_DEPRECATED ION_EXPORT
-# endif
-
-#endif

diff --git a/plasma/shells/CMakeLists.txt b/plasma/shells/CMakeLists.txt
index e418d58..24b54ed 100644 (file)
--- a/plasma/shells/CMakeLists.txt
+++ b/plasma/shells/CMakeLists.txt
@@ -1,3 +1,8 @@
+include_directories(
+    # for plasmagenericshell_export.h
+    ${CMAKE_BINARY_DIR}/libs/plasmagenericshell
+)
+
 add_subdirectory(plasma-desktop)
 add_subdirectory(plasma-overlay)
 add_subdirectory(plasma-windowed)

diff --git a/systemsettings/CMakeLists.txt b/systemsettings/CMakeLists.txt
index ba0eb2a..c6dc3e6 100644 (file)
--- a/systemsettings/CMakeLists.txt
+++ b/systemsettings/CMakeLists.txt
@@ -8,7 +8,12 @@ IF(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 
 ENDIF(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 
-INCLUDE_DIRECTORIES (${CMAKE_CURRENT_SOURCE_DIR}/core ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+INCLUDE_DIRECTORIES (
+    ${CMAKE_CURRENT_SOURCE_DIR}/core
+    ${CMAKE_CURRENT_BINARY_DIR}/core
+    ${CMAKE_BINARY_DIR}
+    ${KDE4_INCLUDES}
+)
 
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(app)

diff --git a/systemsettings/core/CMakeLists.txt b/systemsettings/core/CMakeLists.txt
index 17d0058..80ba98d 100644 (file)
--- a/systemsettings/core/CMakeLists.txt
+++ b/systemsettings/core/CMakeLists.txt
@@ -10,7 +10,7 @@ set(systemsettingsview_LIB_SRCS
 )
 
 set(systemsettingsview_LIB_HDRS
-    systemsettingsview_export.h
+    ${CMAKE_CURRENT_BINARY_DIR}/systemsettingsview_export.h
     MenuItem.h
     MenuModel.h
     MenuProxyModel.h
@@ -23,6 +23,8 @@ add_library(systemsettingsview SHARED ${systemsettingsview_LIB_SRCS})
 
 target_link_libraries(systemsettingsview ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KCMUTILS_LIBS})
 
+generate_export_header(systemsettingsview)
+
 install( TARGETS systemsettingsview  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install( FILES ${systemsettingsview_LIB_HDRS} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/systemsettingsview COMPONENT Devel)
 INSTALL( FILES systemsettingsview.desktop systemsettingsexternalapp.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR})

diff --git a/systemsettings/core/systemsettingsview_export.h b/systemsettings/core/systemsettingsview_export.h
deleted file mode 100644 (file)
index 73695f0..0000000
--- a/systemsettings/core/systemsettingsview_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**************************************************************************
- * Copyright (C) 2009 Ben Cooksley <bcooksley@kde.org>                    *
- *                                                                        *
- * This program is free software; you can redistribute it and/or          *
- * modify it under the terms of the GNU General Public License            *
- * as published by the Free Software Foundation; either version 2         *
- * of the License, or (at your option) any later version.                 *
- *                                                                        *
- * This program is distributed in the hope that it will be useful,        *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- * GNU General Public License for more details.                           *
- *                                                                        *
- * You should have received a copy of the GNU General Public License      *
- * along with this program; if not, write to the Free Software            *
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA          *
- * 02110-1301, USA.                                                       *
-***************************************************************************/
-
-#ifndef SYSTEMSETTINGSVIEW_EXPORT_H
-#define SYSTEMSETTINGSVIEW_EXPORT_H
- 
-// needed for KDE_EXPORT and KDE_IMPORT macros
-#include <kdemacros.h>
- 
-#ifndef SYSTEMSETTINGSVIEW_EXPORT
-# if defined(MAKE_SYSTEMSETTINGSVIEW_LIB)
-   // We are building this library
-#  define SYSTEMSETTINGSVIEW_EXPORT KDE_EXPORT
-# else
-   // We are using this library
-#  define SYSTEMSETTINGSVIEW_EXPORT KDE_IMPORT
-# endif
-#endif
- 
-# ifndef SYSTEMSETTINGSVIEW_EXPORT_DEPRECATED
-#  define SYSTEMSETTINGSVIEW_EXPORT_DEPRECATED KDE_DEPRECATED SYSTEMSETTINGSVIEW_EXPORT
-# endif
- 
-#endif