Test EXPORTS definition with target name as suggested by cmake

diff --git a/src/Basics/SALOME_Basics.hxx b/src/Basics/SALOME_Basics.hxx
index 35defec9fa9963a54461a08ad2598af74c25bc59..cd0690952c83014058d3253f4107c6e28dad44a2 100644 (file)
--- a/src/Basics/SALOME_Basics.hxx
+++ b/src/Basics/SALOME_Basics.hxx
@@ -30,7 +30,7 @@
 
 
 #ifdef WIN32
-# ifdef BASICS_EXPORTS
+# if defined BASICS_EXPORTS || defined SALOMEBasics_EXPORTS
 #  define BASICS_EXPORT __declspec( dllexport )
 # else
 #  define BASICS_EXPORT __declspec( dllimport )

diff --git a/src/Batch/Batch_Defines.hxx b/src/Batch/Batch_Defines.hxx
index e61d83c1e6de4ce52d327303acb014a23f0440a5..84548ad428f7acdebff28b389ff7d8ec60c292e8 100755 (executable)
--- a/src/Batch/Batch_Defines.hxx
+++ b/src/Batch/Batch_Defines.hxx
@@ -27,7 +27,7 @@
 #define _BATCH_Defines_HXX_
 
 #ifdef WIN32
-# ifdef BATCH_EXPORTS
+# if defined BATCH_EXPORTS || defined SalomeBatch_EXPORTS
 #  define BATCH_EXPORT __declspec( dllexport )
 # else
 #  define BATCH_EXPORT __declspec( dllimport )

diff --git a/src/HDFPersist/HDFexport.hxx b/src/HDFPersist/HDFexport.hxx
index 2b0402a6d2cbf080457cf0259f27066d1262cb99..3c969d33f5ae2788cf6ffae4863e2acd681d5288 100644 (file)
--- a/src/HDFPersist/HDFexport.hxx
+++ b/src/HDFPersist/HDFexport.hxx
@@ -27,7 +27,7 @@
 #define _HDF_export_HXX_
 
 #ifdef WIN32
-# ifdef HDFPERSIST_EXPORTS
+# if defined HDFPERSIST_EXPORTS || defined SalomeHDFPersist_EXPORTS
 #  define HDFPERSIST_EXPORT __declspec( dllexport )
 # else
 #  define HDFPERSIST_EXPORT __declspec( dllimport )

diff --git a/src/Logger/SALOME_Logger_Server.hxx b/src/Logger/SALOME_Logger_Server.hxx
index a206328578990dac120877775a2a92badd600dbf..b7f0b913f91e78ff07062d0ad82ee92178c647fd 100644 (file)
--- a/src/Logger/SALOME_Logger_Server.hxx
+++ b/src/Logger/SALOME_Logger_Server.hxx
@@ -37,7 +37,7 @@
 #include "Logger.hh"
 
 #ifdef WIN32
-# if defined LOGGER_EXPORTS
+# if defined LOGGER_EXPORTS || defined SalomeLoggerServer_EXPORTS
 #  define LOGGER_EXPORT __declspec( dllexport )
 # else
 #  define LOGGER_EXPORT __declspec( dllimport )

diff --git a/src/NamingService/SALOME_NamingService_defs.hxx b/src/NamingService/SALOME_NamingService_defs.hxx
index 061d2f9ce785dc1d175422456f24fd77715f6ec7..81dbae46e79696e3a94a48262d82013fc565e7a4 100644 (file)
--- a/src/NamingService/SALOME_NamingService_defs.hxx
+++ b/src/NamingService/SALOME_NamingService_defs.hxx
@@ -29,7 +29,7 @@
 #define SALOME_NAMINGSERVICE_DEFS_HXX
 
 #ifdef WIN32
-# ifdef NAMINGSERVICE_EXPORTS
+# if defined NAMINGSERVICE_EXPORTS || defined SalomeNS_EXPORTS
 #  define NAMINGSERVICE_EXPORT __declspec( dllexport )
 # else
 #  define NAMINGSERVICE_EXPORT __declspec( dllimport )

diff --git a/src/SALOMELocalTrace/SALOME_LocalTrace.hxx b/src/SALOMELocalTrace/SALOME_LocalTrace.hxx
index 663bdb57f7fd5710b43a5e359a12e3a45ce18dcf..568bd2d3640f96a7a3429ca5f832221e94a50a65 100755 (executable)
--- a/src/SALOMELocalTrace/SALOME_LocalTrace.hxx
+++ b/src/SALOMELocalTrace/SALOME_LocalTrace.hxx
@@ -27,7 +27,7 @@
 #define _SALOME_LOCALTRACE_HXX_
 
 #ifdef WIN32
-# ifdef SALOMELOCALTRACE_EXPORTS
+# if defined SALOMELOCALTRACE_EXPORTS || defined SALOMELocalTrace_EXPORTS
 #  define SALOMELOCALTRACE_EXPORT __declspec( dllexport )
 # else
 #  define SALOMELOCALTRACE_EXPORT __declspec( dllimport )

diff --git a/src/SALOMETraceCollector/SALOMETraceCollector.hxx b/src/SALOMETraceCollector/SALOMETraceCollector.hxx
index 5b32f44800c2a5ac98cb5c82fa8158f229de0830..3fa09fabf6e6cb66f1fc8e54141d3870972bb858 100644 (file)
--- a/src/SALOMETraceCollector/SALOMETraceCollector.hxx
+++ b/src/SALOMETraceCollector/SALOMETraceCollector.hxx
@@ -36,7 +36,7 @@
 //! for usage without CORBA
 
 #ifdef WIN32
-# ifdef SALOMETRACECOLLECTOR_EXPORTS
+# if defined SALOMETRACECOLLECTOR_EXPORTS || defined with_loggerTraceCollector_EXPORTS
 #  define SALOMETRACECOLLECTOR_EXPORT __declspec( dllexport )
 # else
 #  define SALOMETRACECOLLECTOR_EXPORT

diff --git a/src/Utils/SALOME_Utils.hxx b/src/Utils/SALOME_Utils.hxx
index d3d3184b7ce7fc4beed53228b7b45ae13092ce0a..805a8e830157fada3badcc3ef5d61db741ad70fa 100755 (executable)
--- a/src/Utils/SALOME_Utils.hxx
+++ b/src/Utils/SALOME_Utils.hxx
@@ -27,7 +27,7 @@
 #define _SALOME_UTILS_HXX_
 
 #ifdef WIN32
-# if defined UTILS_EXPORTS
+# if defined UTILS_EXPORTS || defined OpUtil_EXPORTS
 #  define UTILS_EXPORT __declspec( dllexport )
 # else
 #  define UTILS_EXPORT __declspec( dllimport )

diff --git a/src/Utils/Utils_SALOME_Exception.hxx b/src/Utils/Utils_SALOME_Exception.hxx
index c093e05c5caacd4134bab7ded4e26529b3792387..30d378266cd45dcbe8b44319f8c848f8085e6752 100644 (file)
--- a/src/Utils/Utils_SALOME_Exception.hxx
+++ b/src/Utils/Utils_SALOME_Exception.hxx
@@ -46,7 +46,7 @@
 //therefore (temporary solution) defines are placed below
 
 #ifdef WIN32
-# ifdef UTILS_EXPORTS
+# if defined UTILS_EXPORTS || defined OpUtil_EXPORTS
 #  define UTILS_EXPORT __declspec( dllexport )
 # else
 #  define UTILS_EXPORT __declspec( dllimport )