From: rnv <rnv@opencascade.com>
Date: Tue, 10 Jan 2012 14:25:18 +0000 (+0000)
Subject: Build SALOME on win32 platform.
X-Git-Tag: V6_5_0a1~61
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=560e48c02d0783eb2f1a6265812756808170c286;p=modules%2Fkernel.git

Build SALOME on win32 platform.
---

diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index c4c6d0829..891ac3ce4 100644
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -286,6 +286,7 @@ class CMakeFile(object):
             "ToolsGUI",
             "ViewerTools",
             "VTKViewer",
+            "vtkEDFOverloads"
             ]
         geom_list = [
             "AdvancedGUI",
@@ -394,6 +395,7 @@ class CMakeFile(object):
         # --
         for key in full_list:
             content = content.replace("-l%s"%(key), "${%s}"%(key))
+         
             pass
         
         # --
@@ -1025,11 +1027,11 @@ 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: To remove GUI_SRC/tools/dlgfactory 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")
+	if platform == "win32" and self.module == 'gui' and self.root[-len('GUI_SRC\\tools'):] == 'GUI_SRC\\tools':
+          fields.remove("dlgfactory")
         
         for i in range(len(fields)):
             newlines.append("%s    %s"%(spaces, fields[i]))
@@ -1288,7 +1290,7 @@ class CMakeFile(object):
         
         # --
         # --
-        for key in ["lib_LTLIBRARIES", "noinst_LTLIBRARIES", "salomepyexec_LTLIBRARIES"]:
+        for key in ["lib_LTLIBRARIES", "noinst_LTLIBRARIES", "salomepyexec_LTLIBRARIES", "libparaview_LTLIBRARIES"] :
             if self.__thedict__.has_key(key):
                 self.addLibTarget(key, newlines)
                 pass
@@ -2112,6 +2114,10 @@ class CMakeFile(object):
                 newlines.append(r'''
                 SET(DEST lib)
                 ''')
+            elif key == "libparaview_LTLIBRARIES":
+                newlines.append(r'''
+                SET(DEST lib/paraview)
+                ''')                
             else:
                 newlines.append(r'''
                 SET(DEST lib/salome)
diff --git a/src/ResourcesManager/Makefile.am b/src/ResourcesManager/Makefile.am
index c915a4896..e63b036d6 100755
--- a/src/ResourcesManager/Makefile.am
+++ b/src/ResourcesManager/Makefile.am
@@ -101,4 +101,5 @@ libResourcesManager_la_CPPFLAGS =\
 libResourcesManager_la_LDFLAGS = -no-undefined -version-info=0:0:0
 libResourcesManager_la_LIBADD  =\
 	../Basics/libSALOMEBasics.la \
+	../Utils/libOpUtil.la \
 	@LIBXML_LIBS@