From: adam Date: Fri, 6 Mar 2009 15:52:44 +0000 (+0000) Subject: Test EXPORTS definition with target name as suggested by cmake X-Git-Tag: V5_1_1rc2~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2b2368b20184f7e76805c37f291614e2ade67fd0;p=modules%2Fgeom.git Test EXPORTS definition with target name as suggested by cmake --- diff --git a/src/BREPExport/BREPExport.cxx b/src/BREPExport/BREPExport.cxx index bce5d516e..b8902150b 100644 --- a/src/BREPExport/BREPExport.cxx +++ b/src/BREPExport/BREPExport.cxx @@ -32,7 +32,7 @@ #include #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 ecc09a6e2..c34ae95fb 100644 --- a/src/BREPImport/BREPImport.cxx +++ b/src/BREPImport/BREPImport.cxx @@ -33,7 +33,7 @@ #include #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 3ef90cceb..d64030f43 100644 --- 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 8f19982a4..5ae47f070 100755 --- 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 ba7a9ef6d..0f08581ba 100644 --- 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 525dde08d..25a73f21d 100755 --- 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 b101bae15..55308f89c 100755 --- 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 97cc42ba3..4482119de 100755 --- 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 b9ef2ed75..e79375250 100755 --- 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 475b41db2..0218bef97 100644 --- a/src/IGESExport/IGESExport.cxx +++ b/src/IGESExport/IGESExport.cxx @@ -34,7 +34,7 @@ #include #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 4830e7743..51ed1ebe3 100644 --- a/src/IGESImport/IGESImport.cxx +++ b/src/IGESImport/IGESImport.cxx @@ -33,7 +33,7 @@ #include #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 c7d239347..f4f7048a5 100755 --- 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 debe363a7..ec50dc361 100644 --- a/src/STEPExport/STEPExport.cxx +++ b/src/STEPExport/STEPExport.cxx @@ -34,7 +34,7 @@ #include #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 2ee8f1363..4440aeb87 100644 --- a/src/STEPImport/STEPImport.cxx +++ b/src/STEPImport/STEPImport.cxx @@ -40,7 +40,7 @@ #include // 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 d264d62a4..49a2d2cc4 100644 --- a/src/STLExport/STLExport.cxx +++ b/src/STLExport/STLExport.cxx @@ -32,7 +32,7 @@ #include #ifdef WIN32 -# if defined STLEXPORT_EXPORTS +# if defined STLEXPORT_EXPORTS || defined STLExport_EXPORTS # define STLEXPORT_EXPORT __declspec( dllexport ) # else # define STLEXPORT_EXPORT __declspec( dllimport )