Windows compatibility

diff --git a/adm_local/cmake_files/FindSalomeMED.cmake b/adm_local/cmake_files/FindSalomeMED.cmake
index 0111f42bd8da955ef4ae45b889afa0954df3188e..7fd5f36407dd83aadb05c5403c3d5f77412f7cb8 100644 (file)
--- a/adm_local/cmake_files/FindSalomeMED.cmake
+++ b/adm_local/cmake_files/FindSalomeMED.cmake
@@ -37,6 +37,10 @@ IF(NOT SalomeMED_FIND_QUIETLY)
   MESSAGE(STATUS "Found Salome MED: ${MED_ROOT_DIR}")
 ENDIF()
 
+FIND_LIBRARY(medcouplingcorba medcouplingcorba ${MED_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(medcouplingclient medcouplingclient ${MED_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(SalomeIDLMED SalomeIDLMED ${MED_ROOT_DIR}/lib/salome)
+
 FOREACH(_res ${SalomeMED_EXTRA_ENV})
   SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeMED_EXTRA_ENV_${_res}}")
 ENDFOREACH()
\ No newline at end of file

diff --git a/src/MEDCalc/cmp/CMakeLists.txt b/src/MEDCalc/cmp/CMakeLists.txt
index 445c4d6dd42d26fb2116b582d0e73fefc0df3bb9..a396313c06e870844e890590fdeb2a61cde3fdb7 100644 (file)
--- a/src/MEDCalc/cmp/CMakeLists.txt
+++ b/src/MEDCalc/cmp/CMakeLists.txt
@@ -52,9 +52,9 @@ SET(MEDEngine_SOURCES
 SET(COMMON_LIBS
   ${PLATFORM_LIBRARIES}
   SalomeIDLMED
-  ${KERNEL_TOOLSDS} ${KERNEL_SalomeHDFPersist} ${KERNEL_SalomeContainer} ${KERNEL_SalomeCommunication}
+  ${KERNEL_TOOLSDS} ${KERNEL_SalomeDS} ${KERNEL_SalomeHDFPersist} ${KERNEL_SalomeContainer} ${KERNEL_SalomeCommunication}
   ${KERNEL_SalomeKernelHelpers} ${KERNEL_SalomeLifeCycleCORBA} ${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMEBasics}
-  ${KERNEL_SalomeGenericObj}
+  ${KERNEL_SalomeGenericObj} ${GUI_PyInterp}
   ${MEDFILE_C_LIBRARIES}
   ${HDF5_LIBRARIES}
   ${OMNIORB_LIBRARIES}

diff --git a/src/MEDCalc/cmp/MEDCALC.hxx b/src/MEDCalc/cmp/MEDCALC.hxx
index 9a3ad134b7c64ef03155d0f5d7b282c3edb9d680..00f240e09ed838162ef5ca65204b83a61c004b27 100644 (file)
--- a/src/MEDCalc/cmp/MEDCALC.hxx
+++ b/src/MEDCalc/cmp/MEDCALC.hxx
@@ -21,7 +21,7 @@
 #define __MEDCALC_HXX__
 
 #ifdef WIN32
-# if defined medcalc_EXPORTS || defined MEDFactoryEngine_EXPORTS || defined MEDFACTORYENGINE_EXPORTS
+# if defined MEDFactoryEngine_EXPORTS || defined MEDEngine_EXPORTS
 #    define MEDCALC_EXPORT __declspec( dllexport )
 #  else
 #    define MEDCALC_EXPORT __declspec( dllimport )

diff --git a/src/MEDCalc/cmp/MEDCalculator_i.hxx b/src/MEDCalc/cmp/MEDCalculator_i.hxx
index 0a2d8eb2b619ab0eec77da598c78e1698adc5cf8..466fddcc9fddd14efcf5166ca583ec3447e5ab8f 100644 (file)
--- a/src/MEDCalc/cmp/MEDCalculator_i.hxx
+++ b/src/MEDCalc/cmp/MEDCalculator_i.hxx
@@ -30,7 +30,7 @@
 #include "MEDDataManager_i.hxx"
 
 #include "MEDCALC.hxx"
-class MEDCALC_EXPORT MEDCalculator_i: public POA_MEDCALC::MEDCalculator,
+class MEDCalculator_i: public POA_MEDCALC::MEDCalculator,
             public SALOME::GenericObj_i
 {
 public:
@@ -40,15 +40,15 @@ public:
   // Functions specified in the IDL interface
   // ===========================================================
   //
-  MEDCALC::FieldHandler * add(const MEDCALC::FieldHandler & f1_hdl, const MEDCALC::FieldHandler & f2_hdl);
-  MEDCALC::FieldHandler * sub(const MEDCALC::FieldHandler & f1_hdl, const MEDCALC::FieldHandler & f2_hdl);
-  MEDCALC::FieldHandler * mul(const MEDCALC::FieldHandler & f1_hdl, const MEDCALC::FieldHandler & f2_hdl);
-  MEDCALC::FieldHandler * div(const MEDCALC::FieldHandler & f1_hdl, const MEDCALC::FieldHandler & f2_hdl);
-  MEDCALC::FieldHandler * pow(const MEDCALC::FieldHandler & f_hdl, CORBA::Long power);
-  MEDCALC::FieldHandler * lin(const MEDCALC::FieldHandler & f_hdl, double factor, double offset);
-  MEDCALC::FieldHandler * dup(const MEDCALC::FieldHandler & f_hdl);
+  MEDCALC_EXPORT MEDCALC::FieldHandler * add(const MEDCALC::FieldHandler & f1_hdl, const MEDCALC::FieldHandler & f2_hdl);
+  MEDCALC_EXPORT MEDCALC::FieldHandler * sub(const MEDCALC::FieldHandler & f1_hdl, const MEDCALC::FieldHandler & f2_hdl);
+  MEDCALC_EXPORT MEDCALC::FieldHandler * mul(const MEDCALC::FieldHandler & f1_hdl, const MEDCALC::FieldHandler & f2_hdl);
+  MEDCALC_EXPORT MEDCALC::FieldHandler * div(const MEDCALC::FieldHandler & f1_hdl, const MEDCALC::FieldHandler & f2_hdl);
+  MEDCALC_EXPORT MEDCALC::FieldHandler * pow(const MEDCALC::FieldHandler & f_hdl, CORBA::Long power);
+  MEDCALC_EXPORT MEDCALC::FieldHandler * lin(const MEDCALC::FieldHandler & f_hdl, double factor, double offset);
+  MEDCALC_EXPORT MEDCALC::FieldHandler * dup(const MEDCALC::FieldHandler & f_hdl);
 
-  MEDCALC::FieldHandler * fct(const MEDCALC::FieldHandler & f_hdl,
+  MEDCALC_EXPORT MEDCALC::FieldHandler * fct(const MEDCALC::FieldHandler & f_hdl,
           const char * function, CORBA::Long nbResComponents);
 
   //

diff --git a/src/MEDCalc/cmp/MEDCommandsHistoryManager_i.hxx b/src/MEDCalc/cmp/MEDCommandsHistoryManager_i.hxx
index fb7f72215cd1f7cc278f36c58ff5fee24840ae32..702df4d1d7b70a831557a9b8f2679e9b7e2fd457 100644 (file)
--- a/src/MEDCalc/cmp/MEDCommandsHistoryManager_i.hxx
+++ b/src/MEDCalc/cmp/MEDCommandsHistoryManager_i.hxx
@@ -26,16 +26,16 @@
 
 #include "MEDCALC.hxx"
 
-class MEDCALC_EXPORT MEDCommandsHistoryManager_i
+class MEDCommandsHistoryManager_i
   : public POA_MEDCALC::MEDCommandsHistoryManager,
     public SALOME::GenericObj_i
 {
  public:
   static MEDCommandsHistoryManager_i* getInstance();
 
-  void addCommand(const char* command);
-  MEDCALC::CommandsList* getCommandsHistory();
-  void clearHistory();
+  MEDCALC_EXPORT void addCommand(const char* command);
+  MEDCALC_EXPORT MEDCALC::CommandsList* getCommandsHistory();
+  MEDCALC_EXPORT void clearHistory();
 
  private:
   MEDCommandsHistoryManager_i();

diff --git a/src/MEDCalc/cmp/MEDDataManager_i.hxx b/src/MEDCalc/cmp/MEDDataManager_i.hxx
index 5192fedb8ea95e3c148fb90dd0b10911fbb83c37..3105b4fc9b09f45f71425eed2cc95f37b3226fa5 100644 (file)
--- a/src/MEDCalc/cmp/MEDDataManager_i.hxx
+++ b/src/MEDCalc/cmp/MEDDataManager_i.hxx
@@ -57,7 +57,7 @@ typedef map<long,MEDCouplingUMesh*> MeshMap;
 typedef map<long,MEDCouplingUMesh*>::iterator MeshMapIterator;
 
 #include "MEDCALC.hxx"
-class MEDCALC_EXPORT MEDDataManager_i: public POA_MEDCALC::MEDDataManager,
+class MEDDataManager_i: public POA_MEDCALC::MEDDataManager,
                                        public SALOME::GenericObj_i
 {
 public:
@@ -69,43 +69,43 @@ public:
   //
   // -----------------------------------------------------------
   // Datasource management
-  MEDCALC::DatasourceHandler * loadDatasource(const char *filepath);
-  MEDCALC::DatasourceHandler * getDatasourceHandler(const char *filepath);
-  MEDCALC::DatasourceHandler * getDatasourceHandlerFromID(CORBA::Long sourceId);
+  MEDCALC_EXPORT MEDCALC::DatasourceHandler * loadDatasource(const char *filepath);
+  MEDCALC_EXPORT MEDCALC::DatasourceHandler * getDatasourceHandler(const char *filepath);
+  MEDCALC_EXPORT MEDCALC::DatasourceHandler * getDatasourceHandlerFromID(CORBA::Long sourceId);
 
   // -----------------------------------------------------------
   // Mesh management
-  MEDCALC::MeshHandlerList * getMeshList(CORBA::Long datasourceId);
-  MEDCALC::MeshHandler * getMesh(CORBA::Long meshId);
+  MEDCALC_EXPORT MEDCALC::MeshHandlerList * getMeshList(CORBA::Long datasourceId);
+  MEDCALC_EXPORT MEDCALC::MeshHandler * getMesh(CORBA::Long meshId);
 
   // -----------------------------------------------------------
   // Field management
-  MEDCALC::FieldseriesHandlerList * getFieldseriesListOnMesh(CORBA::Long meshId);
-  MEDCALC::FieldHandlerList * getFieldListInFieldseries(CORBA::Long fieldseriesId);
+  MEDCALC_EXPORT MEDCALC::FieldseriesHandlerList * getFieldseriesListOnMesh(CORBA::Long meshId);
+  MEDCALC_EXPORT MEDCALC::FieldHandlerList * getFieldListInFieldseries(CORBA::Long fieldseriesId);
 
-  MEDCALC::FieldHandler *     getFieldHandler(CORBA::Long fieldHandlerId);
-  char *                    getFieldRepresentation(CORBA::Long fieldHandlerId);
-  MEDCALC::FieldHandlerList * getFieldHandlerList();
+  MEDCALC_EXPORT MEDCALC::FieldHandler *     getFieldHandler(CORBA::Long fieldHandlerId);
+  MEDCALC_EXPORT char *                    getFieldRepresentation(CORBA::Long fieldHandlerId);
+  MEDCALC_EXPORT MEDCALC::FieldHandlerList * getFieldHandlerList();
 
-  void                      saveFields(const char * filepath,
+  MEDCALC_EXPORT void      saveFields(const char * filepath,
                                        const MEDCALC::FieldIdList & fieldIdList);
-  void                      markAsPersistent(CORBA::Long fieldHandlerId, bool persistent);
-  void                      savePersistentFields(const char * filepath);
+  MEDCALC_EXPORT void      markAsPersistent(CORBA::Long fieldHandlerId, bool persistent);
+  MEDCALC_EXPORT void      savePersistentFields(const char * filepath);
 
 
-  void updateFieldMetadata(CORBA::Long  fieldHandlerId,
+  MEDCALC_EXPORT void updateFieldMetadata(CORBA::Long  fieldHandlerId,
                            const char * fieldname,
                            CORBA::Long  iteration,
                            CORBA::Long  order,
                            const char * source);
 
-  void changeUnderlyingMesh(CORBA::Long fieldHandlerId, CORBA::Long meshHandlerId);
-  MEDCALC::FieldHandler* interpolateField(CORBA::Long fieldHandlerId, CORBA::Long meshHandlerId, const MEDCALC::InterpolationParameters& params);
+  MEDCALC_EXPORT void changeUnderlyingMesh(CORBA::Long fieldHandlerId, CORBA::Long meshHandlerId);
+  MEDCALC_EXPORT MEDCALC::FieldHandler* interpolateField(CORBA::Long fieldHandlerId, CORBA::Long meshHandlerId, const MEDCALC::InterpolationParameters& params);
 
-  void   setEventListenerIOR(const char * ior);
-  char * getEventListenerIOR();
+  MEDCALC_EXPORT void   setEventListenerIOR(const char * ior);
+  MEDCALC_EXPORT char * getEventListenerIOR();
 
-  void serverlog();
+  MEDCALC_EXPORT void serverlog();
 
   //
   // ===========================================================

diff --git a/src/MEDCalc/cmp/MEDPresentationManager_i.hxx b/src/MEDCalc/cmp/MEDPresentationManager_i.hxx
index 1263f88743caedf0ba8d79abe176838a3040533c..00f87a13454216a2a8cc72153fb431cd986b39c2 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationManager_i.hxx
+++ b/src/MEDCalc/cmp/MEDPresentationManager_i.hxx
@@ -35,16 +35,16 @@ typedef ::CORBA::Long TypeID;
 
 class MEDPresentation;
 
-class MEDCALC_EXPORT MEDPresentationManager_i: public POA_MEDCALC::MEDPresentationManager,
+class MEDPresentationManager_i: public POA_MEDCALC::MEDPresentationManager,
                                                public SALOME::GenericObj_i
 {
  public:
 
   static MEDPresentationManager_i* getInstance();
 
-  TypeID makeScalarMap(const MEDCALC::ScalarMapParameters&);
-  void setPresentationProperty(TypeID presentationID, const char * propName, const char * propValue);
-  char* getPresentationProperty(TypeID presentationID, const char* propName);
+  MEDCALC_EXPORT TypeID makeScalarMap(const MEDCALC::ScalarMapParameters&);
+  MEDCALC_EXPORT void setPresentationProperty(TypeID presentationID, const char * propName, const char * propValue);
+  MEDCALC_EXPORT char* getPresentationProperty(TypeID presentationID, const char* propName);
 
  private:
   MEDPresentationManager_i();