OSDN > 브라 우즈 소프트웨어 > Desktop Environment > Katana Desktop Environment > SCM > git > libdbusmenu-qt > Commit

Katana Desktop Environment
Fork
kde-playground
kde-extraapps
katana
libdbusmenu-qt
kde-workspace
Katie
kde-l10n
kdelibs
ariya-icons

libdbusmenu-qt: Commit

libdbusmenu-qt from https://code.launchpad.net/libdbusmenu-qt with Katie support

generate the export header

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

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

		@@ -28,6 +28,7 @@ add_definitions(${QT_DEFINITIONS})
28	28
29	29	set(QT_SUFFIX "katie")
30	30
	31	+include(GenerateExportHeader)
31	32	include(GNUInstallDirs)
32	33	set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
33	34	set(INCLUDE_INSTALL_DIR "include/dbusmenu-${QT_SUFFIX}")

--- a/src/CMakeLists.txt

+++ b/src/CMakeLists.txt

		@@ -36,9 +36,8 @@ target_link_libraries(dbusmenu-${QT_SUFFIX}
36	36	${QT_QTCORE_LIBRARIES}
37	37	)
38	38
39		-# Make sure linking to the target adds dbusmenu-qt install directory
40		-target_include_directories(dbusmenu-${QT_SUFFIX}
41		- INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>"
	39	+generate_export_header(dbusmenu-${QT_SUFFIX}
	40	+ BASE_NAME dbusmenu
42	41	)
43	42
44	43	install(

		@@ -55,6 +54,8 @@ install(
55	54	)
56	55
57	56	install(
58		- FILES ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h
	57	+ FILES
	58	+ ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h
	59	+ ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_export.h
59	60	DESTINATION ${INCLUDE_INSTALL_DIR}
60	61	)

--- a/src/dbusmenu_export.h

+++ /dev/null

		@@ -1,37 +0,0 @@
1		-/* This file is part of the dbusmenu-qt library
2		- Copyright 2010 Canonical
3		- Author: Aurelien Gateau <aurelien.gateau@canonical.com>
4		-
5		- This library is free software; you can redistribute it and/or
6		- modify it under the terms of the GNU Library General Public
7		- License (LGPL) as published by the Free Software Foundation;
8		- either version 2 of the License, or (at your option) any later
9		- version.
10		-
11		- This library is distributed in the hope that it will be useful,
12		- but WITHOUT ANY WARRANTY; without even the implied warranty of
13		- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14		- Library General Public License for more details.
15		-
16		- You should have received a copy of the GNU Library General Public License
17		- along with this library; see the file COPYING.LIB. If not, write to
18		- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19		- Boston, MA 02110-1301, USA.
20		-*/
21		-#ifndef DBUSMENU_EXPORT_H
22		-#define DBUSMENU_EXPORT_H
23		-
24		-// Include this file from here to make transition from version 0.3.5 and
25		-// earlier easier (no need to conditionally include a file)
26		-#include <dbusmenu_version.h>
27		-
28		-// Qt
29		-#include <QtCore/QtGlobal>
30		-
31		-#if defined(dbusmenu_qt_EXPORTS) \|\| defined(dbusmenu_katie_EXPORTS)
32		-#define DBUSMENU_EXPORT Q_DECL_EXPORT
33		-#else
34		-#define DBUSMENU_EXPORT Q_DECL_IMPORT
35		-#endif
36		-
37		-#endif /* DBUSMENU_EXPORT_H */