From cc19d5bb89d5237743f081881ded9c5977cdc3e6 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 27 Sep 2012 06:15:00 +0000 Subject: [PATCH] Improve am2cmake procedure: - allow forcing am2cmake conversion procedure for separate modules only (with dedicated env variables, e.g. AM2CMAKE_FORCE_KERNEL_GENERATION) - if top-level CMakeLists.txt file is not am2cmake-generated, stop converting of lower-level files also (instead of checking CMakeLists.txt file separately at each level) --- salome_adm/cmake_files/am2cmake.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py index 51bfdceaf..351ac48fc 100644 --- a/salome_adm/cmake_files/am2cmake.py +++ b/salome_adm/cmake_files/am2cmake.py @@ -2545,6 +2545,7 @@ 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 @@ -2564,8 +2565,9 @@ if __name__ == "__main__": # -- for f in files: if f in ["Makefile.am", "Makefile.am.cmake"]: - convert = True - if getenv("AM2CMAKE_FORCE_GENERATION", "0")=="0": + forced = getenv("AM2CMAKE_FORCE_GENERATION", "0")=="1" or \ + getenv("AM2CMAKE_FORCE_%s_GENERATION"%module.upper(), "0")=="1" + if convert and not forced: # detect if conversion should be done if "CMakeLists.txt" in files: from os.path import join -- 2.39.2