From 9282e3d0d612f89cf50ea8d8dccfb920e0c0d941 Mon Sep 17 00:00:00 2001 From: ana Date: Wed, 17 Jun 2015 13:53:43 +0300 Subject: [PATCH] Windows compatibility --- src/MeasureGUI/CMakeLists.txt | 1 + .../MeasureGUI_ShapeStatisticsDlg.h | 3 +- src/MeasureGUI/MeasureGUI_definitions.h | 33 +++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 src/MeasureGUI/MeasureGUI_definitions.h diff --git a/src/MeasureGUI/CMakeLists.txt b/src/MeasureGUI/CMakeLists.txt index 0f3761522..eaae08f27 100755 --- a/src/MeasureGUI/CMakeLists.txt +++ b/src/MeasureGUI/CMakeLists.txt @@ -104,6 +104,7 @@ SET(MeasureGUI_HEADERS MeasureGUI_DimensionCreateTool.h MeasureGUI_DimensionInteractor.h MeasureGUI_DimensionFilter.h + MeasureGUI_definitions.h ) # header files / to be processed by moc diff --git a/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.h b/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.h index 80131321b..8b604a261 100644 --- a/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.h +++ b/src/MeasureGUI/MeasureGUI_ShapeStatisticsDlg.h @@ -27,6 +27,7 @@ // GEOM includes #include #include "GEOM_GenericObjPtr.h" +#include "MeasureGUI_definitions.h" // Qt includes #include @@ -45,7 +46,7 @@ class Plot2d_Histogram; // purpose : //========================================================================== -class MeasureGUI_ShapeStatisticsDlg : public QDialog, public GEOMBase_Helper +class MEASUREGUI_EXPORT MeasureGUI_ShapeStatisticsDlg : public QDialog, public GEOMBase_Helper { Q_OBJECT diff --git a/src/MeasureGUI/MeasureGUI_definitions.h b/src/MeasureGUI/MeasureGUI_definitions.h new file mode 100644 index 000000000..f61720001 --- /dev/null +++ b/src/MeasureGUI/MeasureGUI_definitions.h @@ -0,0 +1,33 @@ +// Copyright (C) 2015 CEA/DEN, EDF R&D, OPEN CASCADE +// +// 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) 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 +// 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, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +#ifndef MEASUREGUI_DEF_HXX +#define MEASUREGUI_DEF_HXX + +#ifdef WIN32 +# if defined MEASUREGUI_EXPORTS || defined MeasureGUI_EXPORTS +# define MEASUREGUI_EXPORT __declspec( dllexport ) +# else +# define MEASUREGUI_EXPORT __declspec( dllimport ) +# endif +#else +# define MEASUREGUI_EXPORT +#endif + +#endif \ No newline at end of file -- 2.39.2