Test EXPORTS definition with target name as suggested by cmake

diff --git a/src/Container/SALOME_Container.hxx b/src/Container/SALOME_Container.hxx
index c1e1e24df09a9b9d0f7ab4054b30f8d8f5441194..b24bd4ea247e38b58cb48e5715d6544d4e755d80 100755 (executable)
--- 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 d9153543e9b2b59f1854128b5523b12d82ddca4f..33e7fd76c238ce0d9835c3e6dceef564f4037ce0 100644 (file)
--- 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 a321beadf7d6a59637bd3f026249c0cd37586352..6cd96d7fa69092d6016d5db95f10c3ac2c75df8d 100755 (executable)
--- 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 522ca0faabb5daa3ccc99b30b106a2f440b36f61..223a71511accb17fe759ec580ba1ceb507b5a9b3 100644 (file)
--- a/src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx
+++ b/src/LifeCycleCORBA/SALOME_FileTransferCORBA.hxx
@@ -36,7 +36,7 @@
 #include <string>
 
 #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 3c73ad3f98b496e79b3980f046999bbd3a78a5c5..dfbf3d7c9bfefad3265836c0720bc27ed6b22a8e 100644 (file)
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
@@ -41,7 +41,7 @@
 #include <iostream>
 
 #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 cc18e0448dc89767db0207acfb1223a03a683d55..710c575f42778c8d509b0b032fcb23ed4ebc2712 100755 (executable)
--- 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 8dad9d8ccf4d67970ec54c154d7ab00ad9683bb9..faa40bfbf4615da20b683f114ac15063aef9901d 100755 (executable)
--- 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 8613c4b9d8b153e7c455f77a28798e0a00286819..c6d0c25e9cadcb338ba1e0d2c2f284a4ddcc01ca 100755 (executable)
--- 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 959822e492b863a469b3f44219faee555169a283..9fcf8a1c6cb0d89cc4d73fb2625b4f7bac80b9da 100644 (file)
--- 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 fc0f0bb29e8de5e3012121f3a3b563b2e89521a9..8246ffe04cb7a8b1bd26ddc327bac25befa4de17 100644 (file)
--- 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 )