From 7876b59a3275891fd897e1dd36fb7a4b652f36e4 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 6 Mar 2009 16:11:42 +0000 Subject: [PATCH] Test EXPORTS definition with target name as suggested by cmake --- src/CONVERTOR/VISUConvertor.hxx | 2 +- src/ENGINE/VISU_Engine_i.cc | 2 +- src/GUITOOLS/VisuGUITools.h | 2 +- src/OBJECT/VISU_OBJECT.h | 2 +- src/PIPELINE/VISUPipeline.hxx | 2 +- src/VISUGUI/VisuGUI_Factory.cxx | 2 +- src/VISU_I/VISU_I.hxx | 2 +- src/VVTK/VVTK.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/CONVERTOR/VISUConvertor.hxx b/src/CONVERTOR/VISUConvertor.hxx index 13849958..3ed40aeb 100755 --- a/src/CONVERTOR/VISUConvertor.hxx +++ b/src/CONVERTOR/VISUConvertor.hxx @@ -27,7 +27,7 @@ #define _VISUConvertor_HXX_ #ifdef WNT - #if defined VISU_CONVERTOR_EXPORTS + #if defined VISU_CONVERTOR_EXPORTS || defined VisuConvertor_EXPORTS #if defined WIN32 #define VISU_CONVERTOR_EXPORT __declspec( dllexport ) #else diff --git a/src/ENGINE/VISU_Engine_i.cc b/src/ENGINE/VISU_Engine_i.cc index 21b3eeae..887f2da1 100644 --- a/src/ENGINE/VISU_Engine_i.cc +++ b/src/ENGINE/VISU_Engine_i.cc @@ -36,7 +36,7 @@ static int MYDEBUG = 0; #endif #ifdef WNT -#ifdef VISU_ENGINE_EXPORTS +#if defined VISU_ENGINE_EXPORTS || defined VISUEngine_EXPORTS #define VISU_ENGINE_EXPORT __declspec(dllexport) #else #define VISU_ENGINE_EXPORT __declspec(dllimport) diff --git a/src/GUITOOLS/VisuGUITools.h b/src/GUITOOLS/VisuGUITools.h index 615d8906..87537d69 100755 --- a/src/GUITOOLS/VisuGUITools.h +++ b/src/GUITOOLS/VisuGUITools.h @@ -27,7 +27,7 @@ #define _VisuGUITools_H_ #ifdef WNT - #if defined VISU_GUITOOLS_EXPORTS + #if defined VISU_GUITOOLS_EXPORTS || defined VISUGUITOOLS_EXPORTS #if defined WIN32 #define VISU_GUITOOLS_EXPORT __declspec( dllexport ) #else diff --git a/src/OBJECT/VISU_OBJECT.h b/src/OBJECT/VISU_OBJECT.h index 95ee35aa..7b512d90 100755 --- a/src/OBJECT/VISU_OBJECT.h +++ b/src/OBJECT/VISU_OBJECT.h @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifdef WIN32 -# ifdef VISU_OBJECT_EXPORTS +# if defined VISU_OBJECT_EXPORTS || defined VisuObject_EXPORTS # define VISU_OBJECT_EXPORT __declspec(dllexport) # else # define VISU_OBJECT_EXPORT __declspec(dllimport) diff --git a/src/PIPELINE/VISUPipeline.hxx b/src/PIPELINE/VISUPipeline.hxx index f6bae70a..17930bde 100755 --- a/src/PIPELINE/VISUPipeline.hxx +++ b/src/PIPELINE/VISUPipeline.hxx @@ -27,7 +27,7 @@ #define _VISUPipeline_HXX_ #ifdef WNT - #if defined VISU_PIPELINE_EXPORTS + #if defined VISU_PIPELINE_EXPORTS || defined VisuPipeLine_EXPORTS #if defined WIN32 #define VISU_PIPELINE_EXPORT __declspec( dllexport ) #else diff --git a/src/VISUGUI/VisuGUI_Factory.cxx b/src/VISUGUI/VisuGUI_Factory.cxx index 2be47b17..a09a628e 100644 --- a/src/VISUGUI/VisuGUI_Factory.cxx +++ b/src/VISUGUI/VisuGUI_Factory.cxx @@ -30,7 +30,7 @@ #include "CAM_Module.h" #ifdef WNT -#ifdef VISU_VISUGUI_EXPORTS +#if defined VISU_VISUGUI_EXPORTS || defined VISU_EXPORTS #define VISU_VISUGUI_EXPORT __declspec(dllexport) #else #define VISU_VISUGUI_EXPORT __declspec(dllimport) diff --git a/src/VISU_I/VISU_I.hxx b/src/VISU_I/VISU_I.hxx index 3e81200a..88a50c1b 100755 --- a/src/VISU_I/VISU_I.hxx +++ b/src/VISU_I/VISU_I.hxx @@ -27,7 +27,7 @@ #define _VISU_I_HXX_ #ifdef WNT -# if defined VISU_I_EXPORTS +# if defined VISU_I_EXPORTS || defined VISUEngineImpl_EXPORTS # define VISU_I_EXPORT __declspec( dllexport ) # else # define VISU_I_EXPORT __declspec( dllimport ) diff --git a/src/VVTK/VVTK.h b/src/VVTK/VVTK.h index 5d65798f..9564091c 100755 --- a/src/VVTK/VVTK.h +++ b/src/VVTK/VVTK.h @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifdef WNT -#ifdef VISU_VVTK_EXPORTS +#if defined VISU_VVTK_EXPORTS || defined VVTK_EXPORTS #define VVTK_EXPORT __declspec(dllexport) #else #define VVTK_EXPORT __declspec(dllimport) -- 2.39.2