Test EXPORTS definition with target name as suggested by cmake

diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx
index d692a6e5dc8e3939756d759760fa5bb81766ba02..dba5f81986411780338a270d73d097077fc02cd6 100644 (file)
--- a/src/Controls/SMESH_ControlsDef.hxx
+++ b/src/Controls/SMESH_ControlsDef.hxx
@@ -46,7 +46,7 @@
 #include "SMESH_Controls.hxx"
 
 #ifdef WNT
- #if defined SMESHCONTROLS_EXPORTS
+ #if defined SMESHCONTROLS_EXPORTS || defined SMESHControls_EXPORTS
   #define SMESHCONTROLS_EXPORT __declspec( dllexport )
  #else
   #define SMESHCONTROLS_EXPORT __declspec( dllimport )

diff --git a/src/Driver/Driver_Mesh.h b/src/Driver/Driver_Mesh.h
index 9840ed034635bcb9f3af05ac8cc9f64f7778e3d9..94d03ad5eb5b187cbbb27245db64431e0a7b38f3 100644 (file)
--- a/src/Driver/Driver_Mesh.h
+++ b/src/Driver/Driver_Mesh.h
@@ -29,7 +29,7 @@
 #include <string>
 
 #ifdef WNT
- #if defined MESHDRIVER_EXPORTS
+ #if defined MESHDRIVER_EXPORTS || defined MeshDriver_EXPORTS
   #define MESHDRIVER_EXPORT __declspec( dllexport )
  #else
   #define MESHDRIVER_EXPORT __declspec( dllimport )

diff --git a/src/DriverDAT/SMESH_DriverDAT.hxx b/src/DriverDAT/SMESH_DriverDAT.hxx
index 9020c6fc1b7e8db3bd78c5ad7e418291ce67f8a6..182fd11221bafdc45471bb9e0d1a91201a088a93 100755 (executable)
--- a/src/DriverDAT/SMESH_DriverDAT.hxx
+++ b/src/DriverDAT/SMESH_DriverDAT.hxx
@@ -27,7 +27,7 @@
 #define _SMESH_DriverDAT_HXX_
 
 #ifdef WNT
- #if defined MESHDRIVERDAT_EXPORTS
+ #if defined MESHDRIVERDAT_EXPORTS || defined MeshDriverDAT_EXPORTS
   #define MESHDRIVERDAT_EXPORT __declspec( dllexport )
  #else
   #define MESHDRIVERDAT_EXPORT __declspec( dllimport )

diff --git a/src/DriverMED/SMESH_DriverMED.hxx b/src/DriverMED/SMESH_DriverMED.hxx
index 0042f9366de15d819dd2a85780f56bd99bd65ffa..83e94819456487db9d6965b5fec8043448818de9 100755 (executable)
--- a/src/DriverMED/SMESH_DriverMED.hxx
+++ b/src/DriverMED/SMESH_DriverMED.hxx
@@ -27,7 +27,7 @@
 #define _SMESH_DriverMED_HXX_
 
 #ifdef WNT
- #if defined MESHDRIVERMED_EXPORTS
+ #if defined MESHDRIVERMED_EXPORTS || defined MeshDriverMED_EXPORTS
   #define MESHDRIVERMED_EXPORT __declspec( dllexport )
  #else
   #define MESHDRIVERMED_EXPORT __declspec( dllimport )

diff --git a/src/DriverSTL/SMESH_DriverSTL.hxx b/src/DriverSTL/SMESH_DriverSTL.hxx
index 4246d18adb2ea017a5a1b09b3654aacf81d4ef99..f30ef50fe69e84a82babc2ccba2d7b44c1491dd0 100755 (executable)
--- a/src/DriverSTL/SMESH_DriverSTL.hxx
+++ b/src/DriverSTL/SMESH_DriverSTL.hxx
@@ -27,7 +27,7 @@
 #define _SMESH_DriverSTL_HXX_
 
 #ifdef WNT
- #if defined MESHDRIVERSTL_EXPORTS
+ #if defined MESHDRIVERSTL_EXPORTS || defined MeshDriverSTL_EXPORTS
   #define MESHDRIVERSTL_EXPORT __declspec( dllexport )
  #else
   #define MESHDRIVERSTL_EXPORT __declspec( dllimport )

diff --git a/src/DriverUNV/SMESH_DriverUNV.hxx b/src/DriverUNV/SMESH_DriverUNV.hxx
index 106b6e93903d7875534148cbd03193368204da18..212764429301e4e760c08c990fc1a8d436feaaa9 100755 (executable)
--- a/src/DriverUNV/SMESH_DriverUNV.hxx
+++ b/src/DriverUNV/SMESH_DriverUNV.hxx
@@ -27,7 +27,7 @@
 #define _SMESH_DriverUNV_HXX_
 
 #ifdef WNT
- #if defined MESHDRIVERUNV_EXPORTS
+ #if defined MESHDRIVERUNV_EXPORTS || defined MeshDriverUNV_EXPORTS
   #define MESHDRIVERUNV_EXPORT __declspec( dllexport )
  #else
   #define MESHDRIVERUNV_EXPORT __declspec( dllimport )

diff --git a/src/OBJECT/SMESH_Object.h b/src/OBJECT/SMESH_Object.h
index 638155200f484c973e74f76b0089f0d6c3389760..3d4dbbf8b433b30c685b8a1b1d7808c53220d5e9 100644 (file)
--- a/src/OBJECT/SMESH_Object.h
+++ b/src/OBJECT/SMESH_Object.h
@@ -29,7 +29,7 @@
 #define SMESH_OBJECT_H
 
 #ifdef WNT
- #if defined SMESHOBJECT_EXPORTS
+ #if defined SMESHOBJECT_EXPORTS || defined SMESHObject_EXPORTS
   #define SMESHOBJECT_EXPORT __declspec( dllexport )
  #else
   #define SMESHOBJECT_EXPORT __declspec( dllimport )

diff --git a/src/SMESH/SMESH_SMESH.hxx b/src/SMESH/SMESH_SMESH.hxx
index 249fc6a8553846ec234709ced4b4219c1169cb5e..72923b2e997ca9d0ff20a94337d76cf97856f579 100755 (executable)
--- a/src/SMESH/SMESH_SMESH.hxx
+++ b/src/SMESH/SMESH_SMESH.hxx
@@ -27,7 +27,7 @@
 #define _SMESH_SMESH_HXX_
 
 #ifdef WNT
- #if defined SMESH_EXPORTS
+ #if defined SMESHimpl_EXPORTS
   #define SMESH_EXPORT __declspec( dllexport )
  #else
   #define SMESH_EXPORT __declspec( dllimport )

diff --git a/src/SMESHClient/SMESH_Client.hxx b/src/SMESHClient/SMESH_Client.hxx
index 99e3de4b851179a2cd52979590903109b5ef2332..ac2411676a37d343af7b7b57dca905c8194d5363 100644 (file)
--- a/src/SMESHClient/SMESH_Client.hxx
+++ b/src/SMESHClient/SMESH_Client.hxx
@@ -32,7 +32,7 @@
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 
 #ifdef WNT
-# ifdef SMESHCLIENT_EXPORTS
+# if defined SMESHCLIENT_EXPORTS || defined SMESHClient_EXPORTS
 #  define SMESHCLIENT_EXPORT __declspec( dllexport )
 # else
 #  define SMESHCLIENT_EXPORT __declspec( dllimport )

diff --git a/src/SMESHFiltersSelection/SMESH_Type.h b/src/SMESHFiltersSelection/SMESH_Type.h
index 106110e09a983e86d6faf718c207edb862b5ede9..881527ac1b184a4e3e7a9379858a7a475a959b6b 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_Type.h
+++ b/src/SMESHFiltersSelection/SMESH_Type.h
@@ -30,7 +30,7 @@
 #define SMESH_TYPE_HEADER
 
 #ifdef WNT
- #if defined SMESHFILTERSSELECTION_EXPORTS
+ #if defined SMESHFILTERSSELECTION_EXPORTS || defined SMESHFiltersSelection_EXPORTS
   #define SMESHFILTERSSELECTION_EXPORT __declspec( dllexport )
  #else
   #define SMESHFILTERSSELECTION_EXPORT __declspec( dllimport )

diff --git a/src/SMESHGUI/SMESH_SMESHGUI.hxx b/src/SMESHGUI/SMESH_SMESHGUI.hxx
index 46a6cb93a2374914d28f7187f34e36b4590d661b..fb74c18284104862805d315508f60c434daf0578 100755 (executable)
--- a/src/SMESHGUI/SMESH_SMESHGUI.hxx
+++ b/src/SMESHGUI/SMESH_SMESHGUI.hxx
@@ -26,7 +26,7 @@
 #define SMESH_SMESHGUI_HXX
 
 #ifdef WNT
- #if defined SMESHGUI_EXPORTS
+ #if defined SMESHGUI_EXPORTS || defined SMESH_EXPORTS
   #define SMESHGUI_EXPORT __declspec( dllexport )
  #else
   #define SMESHGUI_EXPORT __declspec( dllimport )

diff --git a/src/SMESH_I/SMESH.hxx b/src/SMESH_I/SMESH.hxx
index 0bd99b69286cf38aefd387bc253ac1d869639314..be211311ac108077388c150f58cc3156f6e8e1bd 100644 (file)
--- a/src/SMESH_I/SMESH.hxx
+++ b/src/SMESH_I/SMESH.hxx
@@ -29,7 +29,7 @@
 #define _SMESH_I_SMESH_HXX_
 
 #ifdef WNT
- #if defined SMESH_I_EXPORTS
+ #if defined SMESH_I_EXPORTS || defined SMESHEngine_EXPORTS
   #define SMESH_I_EXPORT __declspec( dllexport )
  #else
   #define SMESH_I_EXPORT __declspec( dllimport )

diff --git a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
index a288506a1b499431ef7a67393ff7cec3d840714d..bf60f35ff815ab8e7210c0af32f6c4eecef58525 100644 (file)
--- a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
+++ b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.h
@@ -27,7 +27,7 @@
 #define LIBSMESH_SWIG_H
 
 #ifdef WNT
-#if defined SMESH_SWIG_EXPORTS
+#if defined SMESH_SWIG_EXPORTS || defined _libSMESH_Swig_EXPORTS
   #define SMESH_SWIG_EXPORT __declspec( dllexport )
  #else
   #define SMESH_SWIG_EXPORT __declspec( dllimport )

diff --git a/src/StdMeshers/SMESH_StdMeshers.hxx b/src/StdMeshers/SMESH_StdMeshers.hxx
index be440c1bd35ad57acc7e8528da10e51ac55fffbd..aeee7480d0b896f9cdb6e2dff999a566c4f51987 100755 (executable)
--- a/src/StdMeshers/SMESH_StdMeshers.hxx
+++ b/src/StdMeshers/SMESH_StdMeshers.hxx
@@ -28,7 +28,7 @@
 #define _SMESH_StdMeshers_HXX_
 
 #ifdef WNT
- #if defined STDMESHERS_EXPORTS
+ #if defined STDMESHERS_EXPORTS || defined StdMeshers_EXPORTS
   #define STDMESHERS_EXPORT __declspec( dllexport )
  #else
   #define STDMESHERS_EXPORT __declspec( dllimport )

diff --git a/src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx b/src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx
index 76ce2a2a2a5f4e5f28bd0bfb89ca59e922f31b33..78982bec9e81fd3dfe41bcf2898696a753b85cd8 100755 (executable)
--- a/src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx
+++ b/src/StdMeshersGUI/SMESH_StdMeshersGUI.hxx
@@ -26,7 +26,7 @@
 #define SMESH_STDMESHERSGUI_HXX
 
 #ifdef WNT
- #if defined STDMESHERSGUI_EXPORTS
+ #if defined STDMESHERSGUI_EXPORTS || defined StdMeshersGUI_EXPORTS
   #define STDMESHERSGUI_EXPORT __declspec( dllexport )
  #else
   #define STDMESHERSGUI_EXPORT __declspec( dllimport )

diff --git a/src/StdMeshers_I/SMESH_StdMeshers_I.hxx b/src/StdMeshers_I/SMESH_StdMeshers_I.hxx
index 70a1bda4409ee7da11b7a2c5623e5a1573049cc0..7a4eb769b90ad37293004183cc0816b1caa1fe48 100755 (executable)
--- a/src/StdMeshers_I/SMESH_StdMeshers_I.hxx
+++ b/src/StdMeshers_I/SMESH_StdMeshers_I.hxx
@@ -28,7 +28,7 @@
 #define _SMESH_StdMeshers_I_HXX_
 
 #ifdef WNT
- #if defined STDMESHERS_I_EXPORTS
+ #if defined STDMESHERS_I_EXPORTS || defined StdMeshersEngine_EXPORTS
   #define STDMESHERS_I_EXPORT __declspec( dllexport )
  #else
   #define STDMESHERS_I_EXPORT __declspec( dllimport )