generate the export header

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1100fed..e9fa894 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,7 @@ add_definitions(${QT_DEFINITIONS})
 
 set(QT_SUFFIX "katie")
 
+include(GenerateExportHeader)
 include(GNUInstallDirs)
 set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
 set(INCLUDE_INSTALL_DIR "include/dbusmenu-${QT_SUFFIX}")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1524c85..4ca4e96 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,9 +36,8 @@ target_link_libraries(dbusmenu-${QT_SUFFIX}
     ${QT_QTCORE_LIBRARIES}
 )
 
-# Make sure linking to the target adds dbusmenu-qt install directory
-target_include_directories(dbusmenu-${QT_SUFFIX}
-    INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>"
+generate_export_header(dbusmenu-${QT_SUFFIX}
+    BASE_NAME dbusmenu
 )
 
 install(
@@ -55,6 +54,8 @@ install(
 )
 
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h
+    FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h
+    ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_export.h
     DESTINATION ${INCLUDE_INSTALL_DIR}
 )

diff --git a/src/dbusmenu_export.h b/src/dbusmenu_export.h
deleted file mode 100644 (file)
index bcc5834..0000000
--- a/src/dbusmenu_export.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* This file is part of the dbusmenu-qt library
-   Copyright 2010 Canonical
-   Author: Aurelien Gateau <aurelien.gateau@canonical.com>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License (LGPL) 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 DBUSMENU_EXPORT_H
-#define DBUSMENU_EXPORT_H
-
-// Include this file from here to make transition from version 0.3.5 and
-// earlier easier (no need to conditionally include a file)
-#include <dbusmenu_version.h>
-
-// Qt
-#include <QtCore/QtGlobal>
-
-#if defined(dbusmenu_qt_EXPORTS) || defined(dbusmenu_katie_EXPORTS)
-#define DBUSMENU_EXPORT Q_DECL_EXPORT
-#else
-#define DBUSMENU_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif /* DBUSMENU_EXPORT_H */