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

List:       kde-commits
Subject:    [kdepim/frameworks] kaddressbookgrantlee: Remove kdemacro.h when used autogenerate export header fil
From:       Montel Laurent <montel () kde ! org>
Date:       2014-07-21 12:00:56
Message-ID: E1X9CH2-0005Gk-UF () scm ! kde ! org
[Download RAW message or body]

Git commit 14117ed62b8d1aef63570acd42d02e83843baedb by Montel Laurent.
Committed on 21/07/2014 at 12:00.
Pushed by mlaurent into branch 'frameworks'.

Remove kdemacro.h when used autogenerate export header file

M  +1    -0    kaddressbookgrantlee/CMakeLists.txt
D  +0    -39   kaddressbookgrantlee/kaddressbook_grantlee_export.h

http://commits.kde.org/kdepim/14117ed62b8d1aef63570acd42d02e83843baedb

diff --git a/kaddressbookgrantlee/CMakeLists.txt b/kaddressbookgrantlee/CMa=
keLists.txt
index 99e6d0e..c662c62 100644
--- a/kaddressbookgrantlee/CMakeLists.txt
+++ b/kaddressbookgrantlee/CMakeLists.txt
@@ -23,6 +23,7 @@ set(kaddressbook_grantlee_LIB_SRCS
 )
 =

 add_library(kaddressbookgrantlee ${LIBRARY_TYPE} ${kaddressbook_grantlee_L=
IB_SRCS})
+generate_export_header(kaddressbookgrantlee BASE_NAME kaddressbook_grantle=
e)
 target_link_libraries(kaddressbookgrantlee
   Grantlee::Templates
   grantleetheme
diff --git a/kaddressbookgrantlee/kaddressbook_grantlee_export.h b/kaddress=
bookgrantlee/kaddressbook_grantlee_export.h
deleted file mode 100644
index ebd65cf..0000000
--- a/kaddressbookgrantlee/kaddressbook_grantlee_export.h
+++ /dev/null
@@ -1,39 +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 Lice=
nse
-    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 KADDRESSBOOK_GRANTLEE_EXPORT_H
-#define KADDRESSBOOK_GRANTLEE_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef KADDRESSBOOK_GRANTLEE_EXPORT
-# if defined(KDEPIM_STATIC_LIBS)
-   /* No export/import for static libraries */
-#  define KADDRESSBOOK_GRANTLEE_EXPORT
-# elif defined(MAKE_KADDRESSBOOKGRANTLEE_LIB)
-   /* We are building this library */
-#  define KADDRESSBOOK_GRANTLEE_EXPORT KDE_EXPORT
-# else
-   /* We are using this library */
-#  define KADDRESSBOOK_GRANTLEE_EXPORT KDE_IMPORT
-# endif
-#endif
-
-#endif
[prev in list] [next in list] [prev in thread] [next in thread]