Test EXPORTS definition with target name as suggested by cmake

diff --git a/src/CONVERTOR/VISUConvertor.hxx b/src/CONVERTOR/VISUConvertor.hxx
index 13849958809a4eb38167eefd826865463d790814..3ed40aebdcf341ed0fcdff85022485eb07d36fa5 100755 (executable)
--- 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 21b3eeae1bfda2aa2749a4d5a1f12e9f700f8b7f..887f2da125d1748309985e83c906160324f8cac5 100644 (file)
--- 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 615d8906393242b4d1fd10c90f133ccc8714b0ad..87537d695ae3ed63605bd9735b697f2da1132fdd 100755 (executable)
--- 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 95ee35aacf712fe8e3e2d328e43df431ee51a419..7b512d90725a69e2393375a530997f606e2bfdb3 100755 (executable)
--- 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 f6bae70add0248e16c12b604a1fc28c10246e363..17930bdef872132fa85a61e5b5c5f919c1d91382 100755 (executable)
--- 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 2be47b17f0dad880889f2e2ed05e40b3748e7025..a09a628efc9db36ddd3fd2b67f6abbc2263e0030 100644 (file)
--- 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 3e81200aeecea679be3d64ac8577da1f18cf77bf..88a50c1b40c3964d80cecd4bbab5c7f09a6be525 100755 (executable)
--- 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 5d65798f9b04c04b23009f7f8e03f59ea865ab02..9564091cdc0dffa6212090bf83ca933224efcfb8 100755 (executable)
--- 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)