]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
Fix check of the AM2CMAKE_FORCE_GENERATION environment variable
authorvsr <vsr@opencascade.com>
Wed, 21 Mar 2012 08:53:31 +0000 (08:53 +0000)
committervsr <vsr@opencascade.com>
Wed, 21 Mar 2012 08:53:31 +0000 (08:53 +0000)
salome_adm/cmake_files/am2cmake.py

index 5ea1040e97bceab793d6cd38df9334ee55787af3..32808834732a285477310ae0b57612f68d3021d6 100644 (file)
@@ -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