Test EXPORTS definition with target name as suggested by cmake

diff --git a/src/CAF/CAF.h b/src/CAF/CAF.h
index b37265c5f24e2f75128f786fa4058109d2b97949..175192827c55fcd86771e65d1a4a1f1ae40c4809 100755 (executable)
--- 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 d9052d07e3c070957f1b6b4a1506650cfebbe8ab..f790a90c0dc9ef449310f20bb6dc1dc770cc553e 100755 (executable)
--- 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 1748eeaa286131a378284b3ce41900ccd0649a67..bb4f1775016e6c9e6a226b35d51e54b5e9775156 100644 (file)
--- 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 6afaa2b65075975eca048d558ce28e800db1e27a..f85a5fe75460d774014806406f97146c4a6e0b5c 100644 (file)
--- 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 cdcb86da3728d1a7d83529ad167831482ff606f1..f552a42292ff55fe9f79cfbb382821b899ffd7b1 100755 (executable)
--- 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 6f2948d8e7cbd43aeaba905b15324ff5c17d680f..f11fa462a100940a3af4a48f9fdabf34b184294a 100755 (executable)
--- 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 a72acf7bb408fae8c91c5cbb1983a7e115077dfa..47045a2ef9ac0c7121be7e36984bececaa0e683b 100755 (executable)
--- 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 ed34a8ba0785b6e36135f29d1de04e928bf90a96..9da6d8434c5e41a6464baa581f4d56b752a8b9c7 100755 (executable)
--- 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 05aeb50bbc889bbfe3746fdd610472b3cb280813..a7bb2f802a75d0ea38dbce886399909b0a0bef49 100755 (executable)
--- 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 c2af7486a0d5bee8c5a11a8a517e1aa5ea0ea07e..1787033375fcf358d613fadb67ea54d0cd3f2ca4 100644 (file)
--- 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 f75022fc84e013de97953af3678971c06c448238..dd75ef6748c0c9a17847ae048d43e251527c419c 100755 (executable)
--- 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 9472e53233e6a7b8cb335ff7991577822cf97529..f7c742c0da130b1ca4b84c5d5f40591ca8228909 100644 (file)
--- 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 19f6faf277438466c23535842f395fe743d885ed..69bcd4acab2b3d666c45d3ae155944d558a0474f 100755 (executable)
--- 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 f17edde9fa25ac91ebb58cb67ca3d1ecf47adc41..0a87b0c3fe9f308e139cb47deaef9e94c1be31cb 100644 (file)
--- 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 858889b613e2126662b33c482362620f45066f00..da83380cab5d58270feb9bf4edbeae9495c980ec 100644 (file)
--- 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 ee67032a5d2a04b5951bf4c2b317906cd1fc9821..61cc769dcd1c99d64654adc7d2e44e9ddc182498 100644 (file)
--- 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 9e7794c80b76ae080c280506d4f3848ef6eb9e75..329f60208c762fd38e16005c7f928d35b1cd17f0 100755 (executable)
--- 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 320c0e5716701811da499e90f8aaa3e4a9e916e5..fef91eb1052d5aa068ae1220e98a59f779a40503 100644 (file)
--- 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 6569cff7fb96dc1b0ccacfcc4316ee87d4d614c1..ff0bd3e802b8501dbf8bea169cdb947958fd874b 100755 (executable)
--- 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 2d52a79f6b3613819fc3ebd892f18976db3f9aeb..d4976821305ed6e573ea4980f4a12893ac4bc198 100755 (executable)
--- 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 17b41cd5d7adf84454e38a5538b3482ed0588bcb..4921334d086484c0933d0ca54b6fcf6512ccea1e 100644 (file)
--- 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 dcc9eaf4d89297041d3abac7a784f40ffb52c6bc..c7c7d6a563ab1b2668239b7e9624d351f67f09bb 100755 (executable)
--- 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 8cd598065086af2c0681618ad340ad2559849c45..6d67e6e712f2bd12be4b849dbbd4a43d302d12e3 100755 (executable)
--- 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 51d8ed6b688847e79a8a3593c218ded40178164f..c3d571696ede2a032ae49a50e25f45553b0bd769 100644 (file)
--- 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 0a0d4fe8374d2fbd2b2bc6b084e01757765e6853..c780df96e645d99e30b2fe7e3374da8e9fd81e8b 100755 (executable)
--- 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 9d79eb1747ca1a4d724fa7204e796a32e9d99a0d..576c637e2697b7d08876859c14fb72c7b23099ec 100644 (file)
--- 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 853fc4ab8cad9d030a083f0b55765fe30fe5d4ea..ec62ef5a197891fb6cb70897bd4d2c81e92e1a18 100755 (executable)
--- 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 c05da2448d7e48a8d3bf13ff000f07a868acf64d..3cac9e50109a975aca14f19cb7fae2fa7df7ab82 100755 (executable)
--- 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 )