From: vsr <vsr@opencascade.com>
Date: Wed, 21 Mar 2012 08:53:31 +0000 (+0000)
Subject: Fix check of the AM2CMAKE_FORCE_GENERATION environment variable
X-Git-Tag: V6_5_0a1~20
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e81f9827cf3e7e926e7e47da2f510d05e30b1533;p=modules%2Fkernel.git

Fix check of the AM2CMAKE_FORCE_GENERATION environment variable
---

diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index 5ea1040e9..328088347 100644
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -2568,13 +2568,12 @@ if __name__ == "__main__":
         for f in files:
             if f in ["Makefile.am", "Makefile.am.cmake"]:
                 convert = True
-                if getenv("AM2CMAKE_FORCE_GENERATION")=="0":
+                if getenv("AM2CMAKE_FORCE_GENERATION", "0")=="0":
+                    # detect if conversion should be done
                     if "CMakeLists.txt" in files:
                         from os.path import join
                         ff = open(join(root, "CMakeLists.txt"))
                         content = ff.read()
-                        import sys
-                        sys.exit(-1)
                         ff.close()
                         if content.find("generated by am2cmake") == -1:
                             convert = False