From 6e9592f6ca352bfee71ef3b67a24f100aa208d49 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bernard=20S=C3=A9cher=C3=83?= <bernard.secher@cea.fr>
Date: Mon, 8 Feb 2021 16:09:32 +0100
Subject: [PATCH] conflict between utils.py from efficace and utils.py from
 solverlab

---
 CoreFlows/gui/CMakeLists.txt                 | 8 ++++----
 CoreFlows/gui/salome/src/CMakeLists.txt      | 4 ++--
 CoreFlows/gui/{utils.py.in => slutils.py.in} | 0
 CoreFlows/gui/ui/MainCFWidget.py             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename CoreFlows/gui/{utils.py.in => slutils.py.in} (100%)

diff --git a/CoreFlows/gui/CMakeLists.txt b/CoreFlows/gui/CMakeLists.txt
index eeb4b94..ebdcb11 100644
--- a/CoreFlows/gui/CMakeLists.txt
+++ b/CoreFlows/gui/CMakeLists.txt
@@ -42,14 +42,14 @@ ELSE ( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR})
       @ONLY
   )
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/SalomePyQt_MockUp.py DESTINATION lib/python)
-  # Configure file utils.py
+  # Configure file slutils.py
   SET(SALOME_INSTALL_PYTHON "lib/python"${PYTHON_VERSION}"/site-packages/salome")#This is to use the same variable as salome
   configure_file(
-      utils.py.in
-      utils.py
+      slutils.py.in
+      slutils.py
       @ONLY
   )
-  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/utils.py DESTINATION lib/python)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/slutils.py DESTINATION lib/python)
 ENDIF( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR}) AND (EXISTS $ENV{GUI_ROOT_DIR}) )
 
 ADD_SUBDIRECTORY(ui)
diff --git a/CoreFlows/gui/salome/src/CMakeLists.txt b/CoreFlows/gui/salome/src/CMakeLists.txt
index eb1ac54..08c51af 100755
--- a/CoreFlows/gui/salome/src/CMakeLists.txt
+++ b/CoreFlows/gui/salome/src/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 SET(SGPYQT_RES_DIR "${SALOME_INSTALL_RES}")
 SALOME_CONFIGURE_FILE(../../SalomePyQt_MockUp.py.in mockup/SalomePyQt_MockUp.py)
-SALOME_CONFIGURE_FILE(../../utils.py.in             utils.py)
+SALOME_CONFIGURE_FILE(../../slutils.py.in             slutils.py)
 
 SET(_bin_SCRIPTS
     SOLVERLABGUI.py
@@ -30,7 +30,7 @@ SET(_bin_SCRIPTS
 SET(_lib_SCRIPTS
     ${GUI_lib_SCRIPTS}
     ${CMAKE_CURRENT_BINARY_DIR}/mockup/SalomePyQt_MockUp.py
-    ${CMAKE_CURRENT_BINARY_DIR}/utils.py
+    ${CMAKE_CURRENT_BINARY_DIR}/slutils.py
 )
 
 SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
diff --git a/CoreFlows/gui/utils.py.in b/CoreFlows/gui/slutils.py.in
similarity index 100%
rename from CoreFlows/gui/utils.py.in
rename to CoreFlows/gui/slutils.py.in
diff --git a/CoreFlows/gui/ui/MainCFWidget.py b/CoreFlows/gui/ui/MainCFWidget.py
index 9e01f49..64a5dcf 100755
--- a/CoreFlows/gui/ui/MainCFWidget.py
+++ b/CoreFlows/gui/ui/MainCFWidget.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from PyQt5 import QtWidgets, QtCore
 from PyQt5.uic import loadUi
-from utils import completeResPath
+from slutils import completeResPath
 
 import CoreFlows as cf
 import cdmath as cm
-- 
2.39.2