From: vsr <vsr@opencascade.com>
Date: Thu, 27 Sep 2012 07:17:22 +0000 (+0000)
Subject: Modify am2cmake procedure:
X-Git-Tag: V6_6_0a1~24
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6f8a755e7f45b9c92184e19a2d0cf92beb5f2d51;p=modules%2Fkernel.git

Modify am2cmake procedure:
- since generation of CMakeLists.txt is actually required on each level, rollback (partially) previous commit
---

diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index 351ac48fc..69d723fbc 100644
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -2545,7 +2545,6 @@ if __name__ == "__main__":
     #
     from os import getenv
     from os import walk
-    convert = True # convert files by default
     for root, dirs, files in walk(the_root):
         # --
         # E.A. : Remove 'CVS' in dirs
@@ -2565,9 +2564,10 @@ if __name__ == "__main__":
         # --
         for f in files:
             if f in ["Makefile.am", "Makefile.am.cmake"]:
+                convert = True # convert files by default
                 forced = getenv("AM2CMAKE_FORCE_GENERATION", "0")=="1" or \
                          getenv("AM2CMAKE_FORCE_%s_GENERATION"%module.upper(), "0")=="1"
-                if convert and not forced:
+                if not forced:
                     # detect if conversion should be done
                     if "CMakeLists.txt" in files:
                         from os.path import join