From aa87c95a18f581bb5d9564297be18161d657ea25 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 6 Mar 2009 10:54:34 +0000 Subject: [PATCH] Test EXPORTS definition with target name as suggested by cmake --- src/CAF/CAF.h | 2 +- src/Event/Event.h | 2 +- src/GLViewer/GLViewer.h | 2 +- src/LightApp/LightApp.h | 2 +- src/LogWindow/LogWindow.h | 2 +- src/OCCViewer/OCCViewer.h | 2 +- src/ObjBrowser/OB.h | 2 +- src/Plot2d/Plot2d.h | 2 +- src/Prs/SALOME_Prs.h | 2 +- src/PyConsole/PyConsole.h | 2 +- src/PyInterp/PyInterp.h | 2 +- src/QDS/QDS.h | 2 +- src/Qtx/Qtx.h | 2 +- src/QxGraph/QxGraph.h | 2 +- src/QxScene/QxScene.h | 2 +- src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_GUI.h | 2 +- src/SOCC/SOCC.h | 2 +- src/SPlot2d/SPlot2d.h | 2 +- src/STD/STD.h | 2 +- src/SUIT/SUIT.h | 2 +- src/SUITApp/SUITApp_Application.h | 2 +- src/SUPERVGraph/SUPERVGraph.h | 2 +- src/SVTK/SVTK.h | 2 +- src/SalomeApp/SalomeApp.h | 2 +- src/Session/SALOME_Session.hxx | 2 +- src/Style/Style.h | 2 +- src/TOOLSGUI/ToolsGUI.h | 2 +- src/VTKViewer/VTKViewer.h | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/CAF/CAF.h b/src/CAF/CAF.h index b37265c5f..175192827 100755 --- a/src/CAF/CAF.h +++ b/src/CAF/CAF.h @@ -23,7 +23,7 @@ #define CAF_H #if defined WIN32 -# if defined CAF_EXPORTS +# if defined CAF_EXPORTS || defined caf_EXPORTS # define CAF_EXPORT __declspec( dllexport ) # else # define CAF_EXPORT __declspec( dllimport ) diff --git a/src/Event/Event.h b/src/Event/Event.h index d9052d07e..f790a90c0 100755 --- a/src/Event/Event.h +++ b/src/Event/Event.h @@ -23,7 +23,7 @@ #define EVENT_H #ifdef WIN32 -# ifdef EVENT_EXPORTS +# if defined EVENT_EXPORTS || defined Event_EXPORTS # define EVENT_EXPORT __declspec(dllexport) # else # define EVENT_EXPORT __declspec(dllimport) diff --git a/src/GLViewer/GLViewer.h b/src/GLViewer/GLViewer.h index 1748eeaa2..bb4f17750 100644 --- a/src/GLViewer/GLViewer.h +++ b/src/GLViewer/GLViewer.h @@ -26,7 +26,7 @@ // #ifdef WIN32 -#ifdef GLVIEWER_EXPORTS +#if defined GLVIEWER_EXPORTS || defined GLViewer_EXPORTS #define GLVIEWER_API __declspec(dllexport) #else #define GLVIEWER_API __declspec(dllimport) diff --git a/src/LightApp/LightApp.h b/src/LightApp/LightApp.h index 6afaa2b65..f85a5fe75 100644 --- a/src/LightApp/LightApp.h +++ b/src/LightApp/LightApp.h @@ -26,7 +26,7 @@ #define LIGHTAPP_H #ifdef WIN32 -# ifdef LIGHTAPP_EXPORTS +# if defined LIGHTAPP_EXPORTS || defined LightApp_EXPORTS # define LIGHTAPP_EXPORT __declspec(dllexport) # else # define LIGHTAPP_EXPORT __declspec(dllimport) diff --git a/src/LogWindow/LogWindow.h b/src/LogWindow/LogWindow.h index cdcb86da3..f552a4229 100755 --- a/src/LogWindow/LogWindow.h +++ b/src/LogWindow/LogWindow.h @@ -27,7 +27,7 @@ #define LOGWINDOW_H #if defined WIN32 -# if defined LOGWINDOW_EXPORTS +# if defined LOGWINDOW_EXPORTS || defined LogWindow_EXPORTS # define LOGWINDOW_EXPORT __declspec( dllexport ) # else # define LOGWINDOW_EXPORT __declspec( dllimport ) diff --git a/src/OCCViewer/OCCViewer.h b/src/OCCViewer/OCCViewer.h index 6f2948d8e..f11fa462a 100755 --- a/src/OCCViewer/OCCViewer.h +++ b/src/OCCViewer/OCCViewer.h @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifdef WIN32 -#ifdef OCCVIEWER_EXPORTS +#if defined OCCVIEWER_EXPORTS || defined OCCViewer_EXPORTS #define OCCVIEWER_EXPORT __declspec(dllexport) #else #define OCCVIEWER_EXPORT __declspec(dllimport) diff --git a/src/ObjBrowser/OB.h b/src/ObjBrowser/OB.h index a72acf7bb..47045a2ef 100755 --- a/src/ObjBrowser/OB.h +++ b/src/ObjBrowser/OB.h @@ -23,7 +23,7 @@ #define OB_H #if defined WIN32 -# if defined OB_EXPORTS || defined OBJBROWSER_EXPORTS +# if defined OB_EXPORTS || defined OBJBROWSER_EXPORTS || defined ObjBrowser_EXPORTS # define OB_EXPORT __declspec( dllexport ) # else # define OB_EXPORT __declspec( dllimport ) diff --git a/src/Plot2d/Plot2d.h b/src/Plot2d/Plot2d.h index ed34a8ba0..9da6d8434 100755 --- a/src/Plot2d/Plot2d.h +++ b/src/Plot2d/Plot2d.h @@ -26,7 +26,7 @@ #define PLOT2D_H #ifdef WIN32 -# ifdef PLOT2D_EXPORTS +# if defined PLOT2D_EXPORTS || defined Plot2d_EXPORTS # define PLOT2D_EXPORT __declspec(dllexport) # else # define PLOT2D_EXPORT __declspec(dllimport) diff --git a/src/Prs/SALOME_Prs.h b/src/Prs/SALOME_Prs.h index 05aeb50bb..a7bb2f802 100755 --- a/src/Prs/SALOME_Prs.h +++ b/src/Prs/SALOME_Prs.h @@ -23,7 +23,7 @@ #define SALOME_PRS_H #ifdef WIN32 -#ifdef PRS_EXPORTS +#if defined PRS_EXPORTS || defined SalomePrs_EXPORTS #define PRS_EXPORT __declspec(dllexport) #else #define PRS_EXPORT __declspec(dllimport) diff --git a/src/PyConsole/PyConsole.h b/src/PyConsole/PyConsole.h index c2af7486a..178703337 100644 --- a/src/PyConsole/PyConsole.h +++ b/src/PyConsole/PyConsole.h @@ -28,7 +28,7 @@ // ======================================================== // set dllexport type for Win platform #ifdef WIN32 -# ifdef PYCONSOLE_EXPORTS +# if defined PYCONSOLE_EXPORTS || defined PyConsole_EXPORTS # define PYCONSOLE_EXPORT __declspec(dllexport) # else # define PYCONSOLE_EXPORT __declspec(dllimport) diff --git a/src/PyInterp/PyInterp.h b/src/PyInterp/PyInterp.h index f75022fc8..dd75ef674 100755 --- a/src/PyInterp/PyInterp.h +++ b/src/PyInterp/PyInterp.h @@ -28,7 +28,7 @@ // ======================================================== // set dllexport type for Win platform #ifdef WIN32 -# ifdef PYINTERP_EXPORTS +# if defined PYINTERP_EXPORTS || defined PyInterp_EXPORTS # define PYINTERP_EXPORT __declspec(dllexport) # else # define PYINTERP_EXPORT __declspec(dllimport) diff --git a/src/QDS/QDS.h b/src/QDS/QDS.h index 9472e5323..f7c742c0d 100644 --- a/src/QDS/QDS.h +++ b/src/QDS/QDS.h @@ -23,7 +23,7 @@ #define QDS_H #ifdef WIN32 -#ifdef QDS_EXPORTS +#if defined QDS_EXPORTS #define QDS_EXPORT __declspec(dllexport) #else #define QDS_EXPORT __declspec(dllimport) diff --git a/src/Qtx/Qtx.h b/src/Qtx/Qtx.h index 19f6faf27..69bcd4aca 100755 --- a/src/Qtx/Qtx.h +++ b/src/Qtx/Qtx.h @@ -26,7 +26,7 @@ #define QTX_H #if defined WIN32 -# if defined QTX_EXPORTS +# if defined QTX_EXPORTS || defined qtx_EXPORTS # define QTX_EXPORT _declspec( dllexport ) # else # define QTX_EXPORT _declspec( dllimport ) diff --git a/src/QxGraph/QxGraph.h b/src/QxGraph/QxGraph.h index f17edde9f..0a87b0c3f 100644 --- a/src/QxGraph/QxGraph.h +++ b/src/QxGraph/QxGraph.h @@ -22,7 +22,7 @@ // SALOME QxGraph : build Supervisor viewer into desktop // #ifdef WNT -#ifdef QXGRAPH_EXPORTS +#if defined QXGRAPH_EXPORTS || defined QxGraph_EXPORTS #define QXGRAPH_EXPORT __declspec(dllexport) #else #define QXGRAPH_EXPORT __declspec(dllimport) diff --git a/src/QxScene/QxScene.h b/src/QxScene/QxScene.h index 858889b61..da83380ca 100644 --- a/src/QxScene/QxScene.h +++ b/src/QxScene/QxScene.h @@ -22,7 +22,7 @@ // SALOME QxScene : build Supervisor viewer into desktop // #ifdef WNT -#ifdef QXSCENE_EXPORTS +#if defined QXSCENE_EXPORTS || defined QxScene_EXPORTS #define QXSCENE_EXPORT __declspec(dllexport) #else #define QXSCENE_EXPORT __declspec(dllimport) diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_GUI.h b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_GUI.h index ee67032a5..61cc769dc 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_GUI.h +++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_GUI.h @@ -28,7 +28,7 @@ // ======================================================== // set dllexport type for Win platform #ifdef WIN32 -# ifdef SALOME_PYQT_EXPORTS +# if defined SALOME_PYQT_EXPORTS || defined SalomePyQtGUI_EXPORTS # define SALOME_PYQT_EXPORT __declspec(dllexport) # else # define SALOME_PYQT_EXPORT __declspec(dllimport) diff --git a/src/SOCC/SOCC.h b/src/SOCC/SOCC.h index 9e7794c80..329f60208 100755 --- a/src/SOCC/SOCC.h +++ b/src/SOCC/SOCC.h @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifdef WIN32 -#ifdef SOCC_EXPORTS +#if defined SOCC_EXPORTS #define SOCC_EXPORT __declspec(dllexport) #else #define SOCC_EXPORT __declspec(dllimport) diff --git a/src/SPlot2d/SPlot2d.h b/src/SPlot2d/SPlot2d.h index 320c0e571..fef91eb10 100644 --- a/src/SPlot2d/SPlot2d.h +++ b/src/SPlot2d/SPlot2d.h @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifdef WIN32 -#ifdef SPLOT2D_EXPORTS +#if defined SPLOT2D_EXPORTS || defined SPlot2d_EXPORTS #define SPLOT2D_EXPORT __declspec(dllexport) #else #define SPLOT2D_EXPORT __declspec(dllimport) diff --git a/src/STD/STD.h b/src/STD/STD.h index 6569cff7f..ff0bd3e80 100755 --- a/src/STD/STD.h +++ b/src/STD/STD.h @@ -23,7 +23,7 @@ #define STD_H #if defined WIN32 -# if defined STD_EXPORTS +# if defined STD_EXPORTS || defined std_EXPORTS # define STD_EXPORT __declspec( dllexport ) # else # define STD_EXPORT __declspec( dllimport ) diff --git a/src/SUIT/SUIT.h b/src/SUIT/SUIT.h index 2d52a79f6..d49768213 100755 --- a/src/SUIT/SUIT.h +++ b/src/SUIT/SUIT.h @@ -26,7 +26,7 @@ #define SUIT_H #if defined WIN32 -# if defined SUIT_EXPORTS +# if defined SUIT_EXPORTS || defined suit_EXPORTS # define SUIT_EXPORT __declspec( dllexport ) # else # define SUIT_EXPORT __declspec( dllimport ) diff --git a/src/SUITApp/SUITApp_Application.h b/src/SUITApp/SUITApp_Application.h index 17b41cd5d..4921334d0 100644 --- a/src/SUITApp/SUITApp_Application.h +++ b/src/SUITApp/SUITApp_Application.h @@ -31,7 +31,7 @@ class SUIT_ExceptionHandler; #ifdef WNT -# ifdef SUITAPP_EXPORTS +# if defined SUITAPP_EXPORTS || defined SUITApp_EXPORTS # define SUITAPP_EXPORT __declspec(dllexport) # else # define SUITAPP_EXPORT __declspec(dllimport) diff --git a/src/SUPERVGraph/SUPERVGraph.h b/src/SUPERVGraph/SUPERVGraph.h index dcc9eaf4d..c7c7d6a56 100755 --- a/src/SUPERVGraph/SUPERVGraph.h +++ b/src/SUPERVGraph/SUPERVGraph.h @@ -29,7 +29,7 @@ #define SUPERVGraph_HeaderFile #ifdef WIN32 -#ifdef SUPERVGRAPH_EXPORTS +#if defined SUPERVGRAPH_EXPORTS || defined SUPERVGraph_EXPORTS #define SUPERVGRAPH_EXPORT __declspec(dllexport) #else #define SUPERVGRAPH_EXPORT __declspec(dllimport) diff --git a/src/SVTK/SVTK.h b/src/SVTK/SVTK.h index 8cd598065..6d67e6e71 100755 --- a/src/SVTK/SVTK.h +++ b/src/SVTK/SVTK.h @@ -25,7 +25,7 @@ #include "VTKViewer.h" #ifdef WIN32 -# ifdef SVTK_EXPORTS +# if defined SVTK_EXPORTS # define SVTK_EXPORT __declspec(dllexport) # else # define SVTK_EXPORT __declspec(dllimport) diff --git a/src/SalomeApp/SalomeApp.h b/src/SalomeApp/SalomeApp.h index 51d8ed6b6..c3d571696 100644 --- a/src/SalomeApp/SalomeApp.h +++ b/src/SalomeApp/SalomeApp.h @@ -31,7 +31,7 @@ // #ifdef WIN32 -#ifdef SALOMEAPP_EXPORTS +#if defined SALOMEAPP_EXPORTS || defined SalomeApp_EXPORTS #define SALOMEAPP_EXPORT __declspec(dllexport) #else #define SALOMEAPP_EXPORT __declspec(dllimport) diff --git a/src/Session/SALOME_Session.hxx b/src/Session/SALOME_Session.hxx index 0a0d4fe83..c780df96e 100755 --- a/src/Session/SALOME_Session.hxx +++ b/src/Session/SALOME_Session.hxx @@ -27,7 +27,7 @@ #define _SALOME_Session_HXX_ #if defined WIN32 -# if defined SESSION_EXPORTS +# if defined SESSION_EXPORTS || defined SalomeSession_EXPORTS # define SESSION_EXPORT __declspec( dllexport ) # else # define SESSION_EXPORT __declspec( dllimport ) diff --git a/src/Style/Style.h b/src/Style/Style.h index 9d79eb174..576c637e2 100644 --- a/src/Style/Style.h +++ b/src/Style/Style.h @@ -26,7 +26,7 @@ #define STYLE_H #if defined WIN32 -# if defined STYLE_SALOME_EXPORTS || defined STYLE_EXPORTS +# if defined STYLE_SALOME_EXPORTS || defined STYLE_EXPORTS || defined SalomeStyle_EXPORTS # define STYLE_SALOME_EXPORT _declspec( dllexport ) # else # define STYLE_SALOME_EXPORT _declspec( dllimport ) diff --git a/src/TOOLSGUI/ToolsGUI.h b/src/TOOLSGUI/ToolsGUI.h index 853fc4ab8..ec62ef5a1 100755 --- a/src/TOOLSGUI/ToolsGUI.h +++ b/src/TOOLSGUI/ToolsGUI.h @@ -27,7 +27,7 @@ #define TOOLSGUI_H #ifdef WIN32 -# ifdef TOOLSGUI_EXPORTS +# if defined TOOLSGUI_EXPORTS || defined ToolsGUI_EXPORTS # define TOOLSGUI_EXPORT __declspec(dllexport) # else # define TOOLSGUI_EXPORT __declspec(dllimport) diff --git a/src/VTKViewer/VTKViewer.h b/src/VTKViewer/VTKViewer.h index c05da2448..3cac9e501 100755 --- a/src/VTKViewer/VTKViewer.h +++ b/src/VTKViewer/VTKViewer.h @@ -23,7 +23,7 @@ #define VTKVIEWER_H #ifdef WIN32 -# ifdef VTKVIEWER_EXPORTS +# if defined VTKVIEWER_EXPORTS || defined VTKViewer_EXPORTS # define VTKVIEWER_EXPORT __declspec( dllexport ) # else # define VTKVIEWER_EXPORT __declspec( dllimport ) -- 2.39.2