From a534cc68368cbf63fc1a44743778c0ca21ab114e Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 4 Mar 2009 15:24:00 +0000 Subject: [PATCH] Test EXPORTS definition with target name as suggested by cmake --- src/Container/SALOME_Container.hxx | 2 +- src/Launcher/Launcher.hxx | 2 +- src/Launcher/SALOME_Launcher_defs.hxx | 2 +- src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx | 2 +- src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx | 2 +- src/NOTIFICATION_SWIG/SALOME_NOTIFICATION_SWIG.hxx | 2 +- src/Notification/SALOME_NOTIFICATION.hxx | 2 +- src/ResourcesManager/ResourcesManager_Defs.hxx | 2 +- src/ResourcesManager/SALOME_ResourcesManager.hxx | 2 +- src/TestContainer/SALOME_TestComponent.hxx | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Container/SALOME_Container.hxx b/src/Container/SALOME_Container.hxx index c1e1e24df..b24bd4ea2 100755 --- a/src/Container/SALOME_Container.hxx +++ b/src/Container/SALOME_Container.hxx @@ -27,7 +27,7 @@ #define _SALOME_Container_HXX_ #ifdef WIN32 -# ifdef CONTAINER_EXPORTS +# if defined CONTAINER_EXPORTS || defined SalomeContainer_EXPORTS # define CONTAINER_EXPORT __declspec( dllexport ) # else # define CONTAINER_EXPORT __declspec( dllimport ) diff --git a/src/Launcher/Launcher.hxx b/src/Launcher/Launcher.hxx index d9153543e..33e7fd76c 100644 --- a/src/Launcher/Launcher.hxx +++ b/src/Launcher/Launcher.hxx @@ -23,7 +23,7 @@ #define __LAUNCHER_HXX__ #ifdef WIN32 -# ifdef LAUNCHER_EXPORTS +# if defined LAUNCHER_EXPORTS || defined Launcher_EXPORTS # define LAUNCHER_EXPORT __declspec(dllexport) # else # define LAUNCHER_EXPORT __declspec(dllimport) diff --git a/src/Launcher/SALOME_Launcher_defs.hxx b/src/Launcher/SALOME_Launcher_defs.hxx index a321beadf..6cd96d7fa 100755 --- a/src/Launcher/SALOME_Launcher_defs.hxx +++ b/src/Launcher/SALOME_Launcher_defs.hxx @@ -23,7 +23,7 @@ #define __SALOME_LAUNCHER_DEFS_HXX__ #ifdef WIN32 -# ifdef SALOMELAUNCHER_EXPORTS +# if defined SALOMELAUNCHER_EXPORTS || defined SalomeLauncher_EXPORTS # define SALOMELAUNCHER_EXPORT __declspec(dllexport) # else # define SALOMELAUNCHER_EXPORT __declspec(dllimport) diff --git a/src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx b/src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx index 522ca0faa..223a71511 100644 --- a/src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx +++ b/src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx @@ -36,7 +36,7 @@ #include #ifdef WIN32 -# if defined LIFECYCLECORBA_EXPORTS +# if defined LIFECYCLECORBA_EXPORTS || defined SalomeLifeCycleCORBA_EXPORTS # define LIFECYCLECORBA_EXPORT __declspec( dllexport ) # else # define LIFECYCLECORBA_EXPORT __declspec( dllimport ) diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx index 3c73ad3f9..dfbf3d7c9 100644 --- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx +++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx @@ -41,7 +41,7 @@ #include #ifdef WIN32 -# if defined LIFECYCLECORBA_EXPORTS +# if defined LIFECYCLECORBA_EXPORTS || defined SalomeLifeCycleCORBA_EXPORTS # define LIFECYCLECORBA_EXPORT __declspec( dllexport ) # else # define LIFECYCLECORBA_EXPORT __declspec( dllimport ) diff --git a/src/NOTIFICATION_SWIG/SALOME_NOTIFICATION_SWIG.hxx b/src/NOTIFICATION_SWIG/SALOME_NOTIFICATION_SWIG.hxx index cc18e0448..710c575f4 100755 --- a/src/NOTIFICATION_SWIG/SALOME_NOTIFICATION_SWIG.hxx +++ b/src/NOTIFICATION_SWIG/SALOME_NOTIFICATION_SWIG.hxx @@ -27,7 +27,7 @@ #define _SALOME_NOTIFICATION_SWIG_HXX_ #ifdef WIN32 -# ifdef NOTIFICATION_SWIG_EXPORTS +# if defined NOTIFICATION_SWIG_EXPORTS || defined _libNOTIFICATION_EXPORTS # define NOTIFICATION_SWIG_EXPORT __declspec( dllexport ) # else # define NOTIFICATION_SWIG_EXPORT __declspec( dllimport ) diff --git a/src/Notification/SALOME_NOTIFICATION.hxx b/src/Notification/SALOME_NOTIFICATION.hxx index 8dad9d8cc..faa40bfbf 100755 --- a/src/Notification/SALOME_NOTIFICATION.hxx +++ b/src/Notification/SALOME_NOTIFICATION.hxx @@ -27,7 +27,7 @@ #define _SALOME_NOTIFICATION_HXX_ #ifdef WIN32 -# ifdef NOTIFICATION_EXPORTS +# if defined NOTIFICATION_EXPORTS || defined SalomeNotification_EXPORTS # define NOTIFICATION_EXPORT __declspec( dllexport ) # else # define NOTIFICATION_EXPORT __declspec( dllimport ) diff --git a/src/ResourcesManager/ResourcesManager_Defs.hxx b/src/ResourcesManager/ResourcesManager_Defs.hxx index 8613c4b9d..c6d0c25e9 100755 --- a/src/ResourcesManager/ResourcesManager_Defs.hxx +++ b/src/ResourcesManager/ResourcesManager_Defs.hxx @@ -23,7 +23,7 @@ #define __RESOURCESMANAGER_DEFS_HXX__ #ifdef WIN32 -# ifdef RESOURCESMANAGER_EXPORTS +# if defined RESOURCESMANAGER_EXPORTS || defined ResourcesManager_EXPORTS # define RESOURCESMANAGER_EXPORT __declspec( dllexport ) # else # define RESOURCESMANAGER_EXPORT __declspec( dllimport ) diff --git a/src/ResourcesManager/SALOME_ResourcesManager.hxx b/src/ResourcesManager/SALOME_ResourcesManager.hxx index 959822e49..9fcf8a1c6 100644 --- a/src/ResourcesManager/SALOME_ResourcesManager.hxx +++ b/src/ResourcesManager/SALOME_ResourcesManager.hxx @@ -36,7 +36,7 @@ #ifdef WIN32 -# ifdef SALOMERESOURCESMANAGER_EXPORTS +# if defined SALOMERESOURCESMANAGER_EXPORTS || defined SalomeResourcesManager_EXPORTS # define SALOMERESOURCESMANAGER_EXPORT __declspec( dllexport ) # else # define SALOMERESOURCESMANAGER_EXPORT __declspec( dllimport ) diff --git a/src/TestContainer/SALOME_TestComponent.hxx b/src/TestContainer/SALOME_TestComponent.hxx index fc0f0bb29..8246ffe04 100644 --- a/src/TestContainer/SALOME_TestComponent.hxx +++ b/src/TestContainer/SALOME_TestComponent.hxx @@ -27,7 +27,7 @@ #define SALOME_TESTCOMPONENT_HXX #ifdef WIN32 -# if defined TESTCONTAINER_EXPORTS +# if defined TESTCONTAINER_EXPORTS || defined SalomeTestComponentEngine_EXPORTS # define TESTCONTAINER_EXPORT __declspec( dllexport ) # else # define TESTCONTAINER_EXPORT __declspec( dllimport ) -- 2.39.2