rnv: Prepare SALOME-6.4.0 version for windows platform.

diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index 1f996da8d2ec98d349ca06629e42d9279d987f5a..ee59d279cf15dca635936260d282074bbafe703d 100644 (file)
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -787,6 +787,12 @@ class CMakeFile(object):
         SET(salomepythondir ${pythondir}/salome)
         SET(salomepypkgdir ${salomepythondir}/salome)
         """)
+        
+        if self.module == "smesh" and self.root[-len('SMESH_PY'):] == 'SMESH_PY':
+           newlines.append("""
+           SET(smeshpypkgdir ${salomepythondir}/salome/smesh)
+           """)
+           pass
         if self.module == "netgen":
             newlines.append(r'''
             SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DNO_PARALLEL_THREADS -DOCCGEOMETRY -I${CMAKE_CURRENT_SOURCE_DIR})
@@ -1015,6 +1021,14 @@ class CMakeFile(object):
         
         # --
         fields = value.split()
+
+        #rnv: Temporary solution for windows platform:
+        #rnv: To remove GUI_SRC/tools directory, because it contains shell scripts
+        #rnv: Will be fixed in the future
+        from sys import platform
+        if platform == "win32" and self.module == 'gui' and self.root[-len('GUI_SRC'):] == 'GUI_SRC' and key.endswith("SUBDIRS"): 
+          fields.remove("tools")
+        
         for i in range(len(fields)):
             newlines.append("%s    %s"%(spaces, fields[i]))
             pass
@@ -1790,6 +1804,8 @@ class CMakeFile(object):
         SET(targets ${targets} MEDEngine)
         SET(targets ${targets} SMESHEngine)
         SET(targets ${targets} SMESH)
+        SET(targets ${targets} SalomeIDLSPADDER)
+        SET(targets ${targets} MeshJobManagerEngine)
         SET(targets ${targets} StdMeshersEngine)
         SET(targets ${targets} VISUEngineImpl)
         FOREACH(target ${targets})
@@ -2395,7 +2411,6 @@ if __name__ == "__main__":
                 pass
             pass
         # --
-        from sys import stdout
         for f in files:
             if f in ["Makefile.am", "Makefile.am.cmake"]:
                 convertAmFile(the_root, root, dirs, files, f, module)
@@ -2404,6 +2419,7 @@ if __name__ == "__main__":
             pass
         pass
     #
+    from sys import stdout
     if nok:
         if nok == 1:
             msg = "%s file has been converted to cmake"%(nok)

diff --git a/src/KernelHelpers/SALOME_KernelServices.hxx b/src/KernelHelpers/SALOME_KernelServices.hxx
index 7caf01a7514eea769e2b1237f68dc8e5f3d6eb35..b6fc705e15abad5540fea9afe7690bb94b3220b5 100644 (file)
--- a/src/KernelHelpers/SALOME_KernelServices.hxx
+++ b/src/KernelHelpers/SALOME_KernelServices.hxx
@@ -82,7 +82,7 @@ namespace KERNEL {
 
   // ---------------------------------------------
   // To create a standard SALOME exception embedding a simple text
-  SALOME::SALOME_Exception createSalomeException(const char * text);
+  KERNELHELPERS_EXPORT SALOME::SALOME_Exception createSalomeException(const char * text);
 }