Test EXPORTS definition with target name as suggested by cmake

diff --git a/src/BREPExport/BREPExport.cxx b/src/BREPExport/BREPExport.cxx
index bce5d516e8a50d5b3ee2f7bcf20f4d0229d89d79..b8902150baf2b197752e6e412ab68d049b69c500 100644 (file)
--- a/src/BREPExport/BREPExport.cxx
+++ b/src/BREPExport/BREPExport.cxx
@@ -32,7 +32,7 @@
 #include <TopoDS_Shape.hxx>
 
 #ifdef WNT
- #if defined BREPEXPORT_EXPORTS
+ #if defined BREPEXPORT_EXPORTS || defined BREPExport_EXPORTS
   #if defined WIN32
    #define BREPEXPORT_EXPORT __declspec( dllexport )
   #else

diff --git a/src/BREPImport/BREPImport.cxx b/src/BREPImport/BREPImport.cxx
index ecc09a6e2497b1ab1795f57f2006973cf1fce54e..c34ae95fbe30ac8248bfe61746b0a9d70b1b364f 100644 (file)
--- a/src/BREPImport/BREPImport.cxx
+++ b/src/BREPImport/BREPImport.cxx
@@ -33,7 +33,7 @@
 #include <TopoDS_Shape.hxx>
 
 #ifdef WNT
- #if defined BREPIMPORT_EXPORTS
+ #if defined BREPIMPORT_EXPORTS || defined BREPImport_EXPORTS
   #if defined WIN32
    #define BREPIMPORT_EXPORT __declspec( dllexport )
   #else

diff --git a/src/DlgRef/DlgRef.h b/src/DlgRef/DlgRef.h
index 3ef90ccebd137092eb968b202698607cca2bd17d..d64030f43cd0bae7246a71b80e302685de83df04 100644 (file)
--- a/src/DlgRef/DlgRef.h
+++ b/src/DlgRef/DlgRef.h
@@ -26,7 +26,7 @@
 #define GEOM_DLGREF_H
 
 #if defined WIN32
-#  if defined DLGREF_EXPORTS
+#  if defined DLGREF_EXPORTS || defined DlgRef_EXPORTS
 #    define DLGREF_EXPORT __declspec( dllexport )
 #  else
 #    define DLGREF_EXPORT __declspec( dllimport )

diff --git a/src/GEOMBase/GEOM_GEOMBase.hxx b/src/GEOMBase/GEOM_GEOMBase.hxx
index 8f19982a45ff6ddcd6da478468c13de4103904ea..5ae47f070a1ceed9e67b2c5c9e983944afa85305 100755 (executable)
--- a/src/GEOMBase/GEOM_GEOMBase.hxx
+++ b/src/GEOMBase/GEOM_GEOMBase.hxx
@@ -26,7 +26,7 @@
 #define GEOM_GEOMBASE_HXX
 
 #if defined WIN32
-#  if defined GEOMBASE_EXPORTS
+#  if defined GEOMBASE_EXPORTS || defined GEOMBase_EXPORTS
 #    define GEOMBASE_EXPORT __declspec( dllexport )
 #  else
 #    define GEOMBASE_EXPORT __declspec( dllimport )

diff --git a/src/GEOMClient/GEOM_Client.hxx b/src/GEOMClient/GEOM_Client.hxx
index ba7a9ef6d94e3b9ee6391b580c6e171ed7af057f..0f08581ba02e0b66f7d412c08b558a6f9b695fb9 100644 (file)
--- a/src/GEOMClient/GEOM_Client.hxx
+++ b/src/GEOMClient/GEOM_Client.hxx
@@ -52,7 +52,7 @@ class TopoDS_Shape;
 #endif
 
 #ifdef WNT
- #if defined GEOMCLIENT_EXPORTS
+ #if defined GEOMCLIENT_EXPORTS || defined GEOMClient_EXPORTS
   #if defined WIN32
    #define GEOMCLIENT_EXPORT __declspec( dllexport )
   #else

diff --git a/src/GEOMGUI/GEOM_GEOMGUI.hxx b/src/GEOMGUI/GEOM_GEOMGUI.hxx
index 525dde08d9cac17ad441f5915fa129f4bc1c8b5d..25a73f21d12efd821393ba331cbd5f470a39b78e 100755 (executable)
--- a/src/GEOMGUI/GEOM_GEOMGUI.hxx
+++ b/src/GEOMGUI/GEOM_GEOMGUI.hxx
@@ -26,7 +26,7 @@
 #define GEOM_GEOMGUI_HXX
 
 #if defined WIN32
-#  if defined GEOMGUI_EXPORTS
+#  if defined GEOMGUI_EXPORTS || defined GEOM_EXPORTS
 #    define GEOMGUI_EXPORT __declspec( dllexport )
 #  else
 #    define GEOMGUI_EXPORT __declspec( dllimport )

diff --git a/src/GEOMImpl/GEOM_GEOMImpl.hxx b/src/GEOMImpl/GEOM_GEOMImpl.hxx
index b101bae15770b293aa23706f3cc565c08bd4d0f1..55308f89c42a97f691f1823203f80db76487426c 100755 (executable)
--- a/src/GEOMImpl/GEOM_GEOMImpl.hxx
+++ b/src/GEOMImpl/GEOM_GEOMImpl.hxx
@@ -27,7 +27,7 @@
 #define _GEOM_GEOMImpl_HXX_
 
 #ifdef WNT
- #if defined GEOMIMPL_EXPORTS
+ #if defined GEOMIMPL_EXPORTS || defined GEOMimpl_EXPORTS
   #if defined WIN32
    #define GEOMIMPL_EXPORT __declspec( dllexport )
   #else

diff --git a/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx
index 97cc42ba31ae10ac80823f5beecf38c373e14e2f..4482119decaedafb3ece25ed6843740a81736a94 100755 (executable)
--- a/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx
+++ b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx
@@ -27,7 +27,7 @@
 #define _GEOM_ToolsGUI_HXX_
 
 #ifdef WNT
- #if defined GEOMTOOLSGUI_EXPORTS
+ #if defined GEOMTOOLSGUI_EXPORTS || defined GEOMToolsGUI_EXPORTS
   #if defined WIN32
    #define GEOMTOOLSGUI_EXPORT __declspec( dllexport )
   #else

diff --git a/src/GEOM_I/GEOM_GEOM_I.hxx b/src/GEOM_I/GEOM_GEOM_I.hxx
index b9ef2ed7556c6c2184692cf5de4defbc32a97997..e793752501bb0133cff39c43ace1444f7d35ee0f 100755 (executable)
--- a/src/GEOM_I/GEOM_GEOM_I.hxx
+++ b/src/GEOM_I/GEOM_GEOM_I.hxx
@@ -27,7 +27,7 @@
 #define _GEOM_GEOM_I_HXX_
 
 #ifdef WNT
- #if defined GEOM_I_EXPORTS
+ #if defined GEOM_I_EXPORTS || defined GEOMEngine_EXPORTS
   #if defined WIN32
    #define GEOM_I_EXPORT __declspec( dllexport )
   #else

diff --git a/src/IGESExport/IGESExport.cxx b/src/IGESExport/IGESExport.cxx
index 475b41db284d32f3394a6a0eacb73ddd4b798b51..0218bef973583c92cfc04bec5eb2efe4f14f76d3 100644 (file)
--- a/src/IGESExport/IGESExport.cxx
+++ b/src/IGESExport/IGESExport.cxx
@@ -34,7 +34,7 @@
 #include <TopoDS_Shape.hxx>
 
 #ifdef WNT
- #if defined IGESEXPORT_EXPORTS
+ #if defined IGESEXPORT_EXPORTS || defined IGESExport_EXPORTS
   #if defined WIN32
    #define IGESEXPORT_EXPORT __declspec( dllexport )
   #else

diff --git a/src/IGESImport/IGESImport.cxx b/src/IGESImport/IGESImport.cxx
index 4830e774348d38e69d0c6c2ea15859e206842711..51ed1ebe35490767bb2a60fd66cab4e9985ca3bb 100644 (file)
--- a/src/IGESImport/IGESImport.cxx
+++ b/src/IGESImport/IGESImport.cxx
@@ -33,7 +33,7 @@
 #include <TopoDS_Shape.hxx>
 
 #ifdef WNT
- #if defined IGESIMPORT_EXPORTS
+ #if defined IGESIMPORT_EXPORTS || defined IGESImport_EXPORTS
   #if defined WIN32
    #define IGESIMPORT_EXPORT __declspec( dllexport )
   #else

diff --git a/src/OBJECT/GEOM_OBJECT_defs.hxx b/src/OBJECT/GEOM_OBJECT_defs.hxx
index c7d239347f10be10bed66c02d06a15144623a6fe..f4f7048a5b96e40d865ee8f059f8ec80d810ba0d 100755 (executable)
--- a/src/OBJECT/GEOM_OBJECT_defs.hxx
+++ b/src/OBJECT/GEOM_OBJECT_defs.hxx
@@ -27,7 +27,7 @@
 #define _GEOM_OBJECT_defs_HXX_
 
 #ifdef WIN32
-# if defined GEOM_OBJECT_EXPORTS
+# if defined GEOM_OBJECT_EXPORTS || defined GEOMObject_EXPORTS
 #  define GEOM_OBJECT_EXPORT __declspec( dllexport )
 # else
 #  define GEOM_OBJECT_EXPORT __declspec( dllimport )

diff --git a/src/STEPExport/STEPExport.cxx b/src/STEPExport/STEPExport.cxx
index debe363a7419672e94e7f79088f8e56f3dc4ef85..ec50dc3616a5910e2ebb0c9503bd95e37b3cfcf0 100644 (file)
--- a/src/STEPExport/STEPExport.cxx
+++ b/src/STEPExport/STEPExport.cxx
@@ -34,7 +34,7 @@
 #include <TopoDS_Shape.hxx>
 
 #ifdef WNT
- #if defined STEPEXPORT_EXPORTS
+ #if defined STEPEXPORT_EXPORTS || defined STEPExport_EXPORTS
   #if defined WIN32
    #define STEPEXPORT_EXPORT __declspec( dllexport )
   #else

diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx
index 2ee8f1363dfcf571ef82f1743aa0f3994698ec98..4440aeb8767410560194664039cc9b08e23bbd70 100644 (file)
--- a/src/STEPImport/STEPImport.cxx
+++ b/src/STEPImport/STEPImport.cxx
@@ -40,7 +40,7 @@
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
 #ifdef WNT
- #if defined STEPIMPORT_EXPORTS
+ #if defined STEPIMPORT_EXPORTS || defined STEPImport_EXPORTS
   #if defined WIN32
    #define STEPIMPORT_EXPORT __declspec( dllexport )
   #else

diff --git a/src/STLExport/STLExport.cxx b/src/STLExport/STLExport.cxx
index d264d62a48ae8752db307c0217d7707f10e5b54a..49a2d2cc4de9f6c24815a8a31b504c954b74ad80 100644 (file)
--- a/src/STLExport/STLExport.cxx
+++ b/src/STLExport/STLExport.cxx
@@ -32,7 +32,7 @@
 #include <TopoDS_Shape.hxx>
 
 #ifdef WIN32
-# if defined STLEXPORT_EXPORTS
+# if defined STLEXPORT_EXPORTS || defined STLExport_EXPORTS
 #  define STLEXPORT_EXPORT __declspec( dllexport )
 # else
 #  define STLEXPORT_EXPORT __declspec( dllimport )