Commit 27f32c2c authored by Nicolas Fella's avatar Nicolas Fella
Browse files

Use generated export header

parent e8cebec1
Pipeline #167563 passed with stage
in 1 minute and 35 seconds
......@@ -27,6 +27,7 @@ include(ECMMarkNonGuiExecutable)
include(CheckIncludeFiles)
include(ECMSetupVersion)
include(ECMQtDeclareLoggingCategory)
include(GenerateExportHeader)
find_package(Gettext REQUIRED)
find_package(PythonInterp REQUIRED)
......
......@@ -35,4 +35,6 @@ set_target_properties(compoundviewer PROPERTIES
CXX_STANDARD_REQUIRED ON
)
generate_export_header(compoundviewer)
install(TARGETS compoundviewer ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
......@@ -11,7 +11,7 @@
#include <avogadro/io/fileformat.h>
#include <avogadro/qtgui/molecule.h>
#include <libkdeedu_compoundviewer_export.h>
#include "compoundviewer_export.h"
#include <memory>
......
......@@ -9,8 +9,9 @@
#include <avogadro/qtopengl/glwidget.h>
class Q_DECL_EXPORT KalziumGLWidget : public Avogadro::QtOpenGL::GLWidget
{
#include "compoundviewer_export.h"
class COMPOUNDVIEWER_EXPORT KalziumGLWidget : public Avogadro::QtOpenGL::GLWidget {
Q_OBJECT
public:
explicit KalziumGLWidget(QWidget *parent = nullptr);
......
/* This file is part of the KDE project
SPDX-FileCopyrightText: 2007 David Faure <faure@kde.org>
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef LIBKDEEDU_COMPOUNDVIEWER_EXPORT_H
#define LIBKDEEDU_COMPOUNDVIEWER_EXPORT_H
#ifndef COMPOUNDVIEWER_EXPORT
# if defined(MAKE_COMPOUNDVIEWER_LIB)
/* We are building this library */
# define COMPOUNDVIEWER_EXPORT Q_DECL_EXPORT
# else
/* We are using this library */
# define COMPOUNDVIEWER_EXPORT Q_DECL_IMPORT
# endif
#endif
# ifndef COMPOUNDVIEWER_EXPORT_DEPRECATED
# define COMPOUNDVIEWER_EXPORT_DEPRECATED KDE_DEPRECATED COMPOUNDVIEWER_EXPORT
# endif
#endif // LIBKDEEDU_COMPOUNDVIEWER_EXPORT_H
......@@ -17,7 +17,7 @@ target_sources(science PRIVATE
psetables.cpp
)
generate_export_header(science)
target_link_libraries(science Qt5::Xml KF5::UnitConversion KF5::WidgetsAddons KF5::I18n)
set_target_properties(science PROPERTIES VERSION ${KALZIUMLIB_VERSION} SOVERSION ${KALZIUMLIB_SOVERSION} )
......@@ -29,7 +29,7 @@ install(FILES
elementparser.h
isotope.h
isotopeparser.h
libkdeedu_science_export.h
${CMAKE_CURRENT_BINARY_DIR}/science_export.h
moleculeparser.h
parser.h
spectrum.h
......
......@@ -11,7 +11,7 @@
#include <QSharedDataPointer>
#include <QVariant>
#include "libkdeedu_science_export.h"
#include "science_export.h"
class ChemicalDataObjectPrivate;
/**
......
......@@ -7,7 +7,7 @@
#ifndef ELEMENT_H
#define ELEMENT_H
#include "libkdeedu_science_export.h"
#include "science_export.h"
#include <QList>
#include <QVariant>
......
......@@ -10,7 +10,7 @@
#include <QXmlAttributes>
#include <QXmlDefaultHandler>
#include "libkdeedu_science_export.h"
#include "science_export.h"
class Element;
......
......@@ -9,7 +9,7 @@
#include "chemicaldataobject.h"
#include "libkdeedu_science_export.h"
#include "science_export.h"
/**
* @author Carsten Niehaus
......
......@@ -10,8 +10,7 @@
#include <QXmlAttributes>
#include <QXmlDefaultHandler>
#include "libkdeedu_science_export.h"
#include "science_export.h"
class Isotope;
......
/* This file is part of the KDE project
SPDX-FileCopyrightText: 2007 David Faure <faure@kde.org>
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef LIBKDEEDU_SCIENCE_EXPORT_H
#define LIBKDEEDU_SCIENCE_EXPORT_H
#ifndef SCIENCE_EXPORT
# if defined(MAKE_SCIENCE_LIB)
/* We are building this library */
# define SCIENCE_EXPORT Q_DECL_EXPORT
# else
/* We are using this library */
# define SCIENCE_EXPORT Q_DECL_IMPORT
# endif
#endif
# ifndef SCIENCE_EXPORT_DEPRECATED
# define SCIENCE_EXPORT_DEPRECATED KDE_DEPRECATED SCIENCE_EXPORT
# endif
#endif // LIBKDEEDU_SCIENCE_EXPORT_H
......@@ -6,7 +6,7 @@
#ifndef MOLECULEPARSER_H
#define MOLECULEPARSER_H
#include "libkdeedu_science_export.h"
#include "science_export.h"
#include "element.h"
#include "parser.h"
......
......@@ -6,7 +6,7 @@
#ifndef PARSER_H
#define PARSER_H
#include "libkdeedu_science_export.h"
#include "science_export.h"
#include <QString>
......
......@@ -9,7 +9,7 @@
#ifndef PSETABLES_H
#define PSETABLES_H
#include "libkdeedu_science_export.h"
#include "science_export.h"
#include <QList>
#include <QPoint>
......
......@@ -7,7 +7,7 @@
#ifndef SPECTRUM_H
#define SPECTRUM_H
#include "libkdeedu_science_export.h"
#include "science_export.h"
#include <QList>
......
......@@ -6,7 +6,7 @@
#ifndef SPECTRUMPARSER_H
#define SPECTRUMPARSER_H
#include "libkdeedu_science_export.h"
#include "science_export.h"
#include <QFile>
#include <QXmlDefaultHandler>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment