From: adam <adam>
Date: Thu, 20 Nov 2008 15:51:47 +0000 (+0000)
Subject: [E.A.] Initialize correctly SUBDIRS otherwise for the particuliar
X-Git-Tag: V5_1_0rc2~26
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0521b59e9488ad087215fcc4046124ef4a42cb0a;p=modules%2Fkernel.git

[E.A.] Initialize correctly SUBDIRS otherwise for the particuliar
case where SUBDIRS is declared in an enclosed if, the cmake compilation
fails ...
---

diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index 4dbb8f1ff..ab8013315 100644
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -247,7 +247,13 @@ class CMakeFile(object):
                 # SET(ENABLE_QXGRAPHVIEWER ON)
                 """)
                 pass
+            # --
             pass
+        # --
+        newlines.append("""
+        SET(SUBDIRS)
+        """)
+        # --
         return
     
     def treatLine(self, line, newlines, opened_ifs):
@@ -439,7 +445,7 @@ class CMakeFile(object):
         # --
         # convert the SUBDIRS in cmake grammar
         # --
-        if self.__thedict__.has_key("SUBDIRS"):
+        if 1: # self.__thedict__.has_key("SUBDIRS"):
             newlines.append(r'''
             FOREACH(dir ${SUBDIRS})
             ADD_SUBDIRECTORY(${dir})