From e81f9827cf3e7e926e7e47da2f510d05e30b1533 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 21 Mar 2012 08:53:31 +0000 Subject: [PATCH] Fix check of the AM2CMAKE_FORCE_GENERATION environment variable --- salome_adm/cmake_files/am2cmake.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 -- 2.39.2