Update also cmake command

pradal · May 13, 2024 · daeb3a0 · daeb3a0
1 parent b4e4a66
commit daeb3a0
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/src/openalea/deploy/command.py b/src/openalea/deploy/command.py
@@ -413,11 +413,6 @@ def run(self):
         if (not self.scons_scripts):
             return
 
-        # try to import subprocess package
-        import subprocess
-        subprocess_enabled = True
-
-
         # run each scons script from setup.py
         for s in self.scons_scripts:
             try:
@@ -512,13 +507,6 @@ def run(self):
         if (not self.cmake_scripts):
             return
 
-        # try to import subprocess package
-        try:
-            import subprocess
-            subprocess_enabled = True
-        except ImportError:
-            subprocess_enabled = False
-
         # run each CMake script from setup.py
         for s in self.cmake_scripts:
             try:
@@ -536,13 +524,10 @@ def run(self):
                 if not os.path.isdir('build-cmake'):
                     os.mkdir('build-cmake')
 
-                os.chdir('build-cmake')
-
                 # Run CMake
-                if (subprocess_enabled):
-                    retval = subprocess.call(commandstr, shell=True)
-                else:
-                    retval = os.system(commandstr)
+                command_line = shlex.split(commandstr)
+                result = subprocess.run(command_line, cwd='build-cmake', shell=True, timeout=None)
+                retval = result.returncode
 
                 # Test if command success with return value
                 if (retval != 0):