Test EXPORTS definition with target name as suggested by cmake

diff --git a/src/Communication/SALOME_Communication.hxx b/src/Communication/SALOME_Communication.hxx
index 42a7392b3c107ff9491661c8ff395ce8769ce62c..c0c8eba5b9c1d6dca86b4a4fcce695fd48446e5d 100755 (executable)
--- a/src/Communication/SALOME_Communication.hxx
+++ b/src/Communication/SALOME_Communication.hxx
@@ -27,7 +27,7 @@
 #define _SALOME_COMMIUNICATION_HXX_
 
 #ifdef WIN32
-# ifdef COMMUNICATION_EXPORTS
+# if defined COMMUNICATION_EXPORTS || defined SalomeCommunication_EXPORTS
 #  define COMMUNICATION_EXPORT __declspec( dllexport )
 # else
 #  define COMMUNICATION_EXPORT __declspec( dllimport )

diff --git a/src/DF/DF_definitions.hxx b/src/DF/DF_definitions.hxx
index 12e3f6de9257f8d304a801b054e3ac3d4a08daf7..de5d65e6dd2f88312cfa557c4c108a1d111b489f 100644 (file)
--- a/src/DF/DF_definitions.hxx
+++ b/src/DF/DF_definitions.hxx
@@ -23,7 +23,7 @@
 #define  DF_DEF_HXX
 
 #ifdef WIN32
-# ifdef DF_EXPORTS
+# if defined DF_EXPORTS
 #  define DF_EXPORT __declspec( dllexport )
 # else
 #  define DF_EXPORT __declspec( dllimport )

diff --git a/src/DSC/DSC_Basic/DSC_Basic.hxx b/src/DSC/DSC_Basic/DSC_Basic.hxx
index 3e0b4922da208bd5922e8517daa09906cff91d4b..0fec8e5285b5d9909486894c5d306c80b01decb3 100755 (executable)
--- a/src/DSC/DSC_Basic/DSC_Basic.hxx
+++ b/src/DSC/DSC_Basic/DSC_Basic.hxx
@@ -27,7 +27,7 @@
 #define _DSC_Basic_HXX_
 
 #ifdef WIN32
-# ifdef DSC_BASIC_EXPORTS
+# if defined DSC_BASIC_EXPORTS || defined SalomeDSCContainer_EXPORTS
 #  define DSC_BASIC_EXPORT __declspec( dllexport )
 # else
 #  define DSC_BASIC_EXPORT __declspec( dllimport )

diff --git a/src/ParallelContainer/SALOME_ParallelComponent_i.hxx b/src/ParallelContainer/SALOME_ParallelComponent_i.hxx
index 3a72a55ccd1e58f2fedb692ec44e71597a73f659..8f1f37e45cf6eea5f554a178829f50350f130fe1 100644 (file)
--- a/src/ParallelContainer/SALOME_ParallelComponent_i.hxx
+++ b/src/ParallelContainer/SALOME_ParallelComponent_i.hxx
@@ -47,7 +47,7 @@
 class Engines_Parallel_Container_i;
 
 #ifdef WIN32
-# ifdef CONTAINER_EXPORTS
+# if defined CONTAINER_EXPORTS || defined SalomeParallelContainer_EXPORTS
 #  define CONTAINER_EXPORT __declspec( dllexport )
 # else
 #  define CONTAINER_EXPORT __declspec( dllimport )

diff --git a/src/ParallelContainer/SALOME_ParallelContainer_i.hxx b/src/ParallelContainer/SALOME_ParallelContainer_i.hxx
index 1c09296f0bcdc795617d3f2a0d9ebc08265724e7..c76f18a11ede772e66880431de769899cf08dba8 100644 (file)
--- a/src/ParallelContainer/SALOME_ParallelContainer_i.hxx
+++ b/src/ParallelContainer/SALOME_ParallelContainer_i.hxx
@@ -45,7 +45,7 @@
 class SALOME_NamingService;
 
 #ifdef WIN32
-# ifdef CONTAINER_EXPORTS
+# if defined CONTAINER_EXPORTS || defined SalomeParallelContainer_EXPORTS
 #  define CONTAINER_EXPORT __declspec( dllexport )
 # else
 #  define CONTAINER_EXPORT __declspec( dllimport )

diff --git a/src/SALOMEDS/SALOMEDS_Defines.hxx b/src/SALOMEDS/SALOMEDS_Defines.hxx
index 1c4475e4c635712239d16db4d3dfb630ce1430d4..45d2c7dd3bd6368c2bd0fb2d7702477031561fa3 100755 (executable)
--- a/src/SALOMEDS/SALOMEDS_Defines.hxx
+++ b/src/SALOMEDS/SALOMEDS_Defines.hxx
@@ -27,7 +27,7 @@
 #define _SALOMEDS_Defines_HXX_
 
 #ifdef WIN32
-# ifdef SALOMEDS_EXPORTS
+# if defined SALOMEDS_EXPORTS || defined SalomeDS_EXPORTS
 #  define SALOMEDS_EXPORT __declspec( dllexport )
 # else
 #  define SALOMEDS_EXPORT __declspec( dllimport )

diff --git a/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx b/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx
index b9942098a86a8c09999c514f2af993dd32aaee3c..2d63937ba262983730dace527710bf04ec300905 100644 (file)
--- a/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx
+++ b/src/SALOMEDSClient/SALOMEDSClient_definitions.hxx
@@ -23,7 +23,7 @@
 #define  SALOMEDSCLIENT_DEF_HXX
 
 #ifdef WIN32
-# ifdef SALOMEDSCLIENT_EXPORTS
+# if defined SALOMEDSCLIENT_EXPORTS || defined SalomeDSClient_EXPORTS
 #  define SALOMEDSCLIENT_EXPORT __declspec( dllexport )
 # else
 #  define SALOMEDSCLIENT_EXPORT __declspec( dllimport )

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Defines.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Defines.hxx
index 5b6ee955d77e488a1dbff7ec3ab7de39c2ec6775..65905c915576231b2ed24f0a54105ebadc39638f 100755 (executable)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Defines.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Defines.hxx
@@ -27,7 +27,7 @@
 #define _SALOMEDSImpl_Defines_HXX_
 
 #ifdef WIN32
-# if defined SALOMEDSIMPL_EXPORTS
+# if defined SALOMEDSIMPL_EXPORTS || defined SalomeDSImpl_EXPORTS
 #  define SALOMEDSIMPL_EXPORT __declspec( dllexport )
 # else
 #  define SALOMEDSIMPL_EXPORT __declspec( dllimport )

diff --git a/src/TOOLSDS/SALOMEDS_Tool.hxx b/src/TOOLSDS/SALOMEDS_Tool.hxx
index 2184143e947aecc7009a3d8d0a07e8f5ab3c8d0c..427762d6dbbeb3123a31559079c54eb2ef1b1f36 100644 (file)
--- a/src/TOOLSDS/SALOMEDS_Tool.hxx
+++ b/src/TOOLSDS/SALOMEDS_Tool.hxx
@@ -37,7 +37,7 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #ifdef WIN32
-# ifdef TOOLSDS_EXPORTS
+# if defined TOOLSDS_EXPORTS
 #  define TOOLSDS_EXPORT __declspec( dllexport )
 # else
 #  define TOOLSDS_EXPORT __declspec( dllimport )