From e1ea2e9e0cd0ce1c5ca6b3635c947dd2a70da083 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 4 Mar 2009 13:08:03 +0000 Subject: [PATCH] Test EXPORTS definition with target name as suggested by cmake --- src/Basics/SALOME_Basics.hxx | 2 +- src/Batch/Batch_Defines.hxx | 2 +- src/HDFPersist/HDFexport.hxx | 2 +- src/Logger/SALOME_Logger_Server.hxx | 2 +- src/NamingService/SALOME_NamingService_defs.hxx | 2 +- src/SALOMELocalTrace/SALOME_LocalTrace.hxx | 2 +- src/SALOMETraceCollector/SALOMETraceCollector.hxx | 2 +- src/Utils/SALOME_Utils.hxx | 2 +- src/Utils/Utils_SALOME_Exception.hxx | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Basics/SALOME_Basics.hxx b/src/Basics/SALOME_Basics.hxx index 35defec9f..cd0690952 100644 --- 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 e61d83c1e..84548ad42 100755 --- 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 2b0402a6d..3c969d33f 100644 --- 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 a20632857..b7f0b913f 100644 --- 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 061d2f9ce..81dbae46e 100644 --- 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 663bdb57f..568bd2d36 100755 --- 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 5b32f4480..3fa09fabf 100644 --- 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 d3d3184b7..805a8e830 100755 --- 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 c093e05c5..30d378266 100644 --- 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 ) -- 2.39.2