From 214be8ed051b0213ee5b571289d843fb28ea2319 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 4 Mar 2009 16:46:05 +0000 Subject: [PATCH] Test EXPORTS definition with target name as suggested by cmake --- src/Communication/SALOME_Communication.hxx | 2 +- src/DF/DF_definitions.hxx | 2 +- src/DSC/DSC_Basic/DSC_Basic.hxx | 2 +- src/ParallelContainer/SALOME_ParallelComponent_i.hxx | 2 +- src/ParallelContainer/SALOME_ParallelContainer_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_Defines.hxx | 2 +- src/SALOMEDSClient/SALOMEDSClient_definitions.hxx | 2 +- src/SALOMEDSImpl/SALOMEDSImpl_Defines.hxx | 2 +- src/TOOLSDS/SALOMEDS_Tool.hxx | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Communication/SALOME_Communication.hxx b/src/Communication/SALOME_Communication.hxx index 42a7392b3..c0c8eba5b 100755 --- 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 12e3f6de9..de5d65e6d 100644 --- 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 3e0b4922d..0fec8e528 100755 --- 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 3a72a55cc..8f1f37e45 100644 --- 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 1c09296f0..c76f18a11 100644 --- 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 1c4475e4c..45d2c7dd3 100755 --- 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 b9942098a..2d63937ba 100644 --- 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 5b6ee955d..65905c915 100755 --- 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 2184143e9..427762d6d 100644 --- 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 ) -- 2.39.2