From 66cf178f84cc1b7672de1f1abc104f587224e51e Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Tue, 10 Oct 2023 19:51:16 +0200
Subject: [PATCH] use -DPYTHON_EXECUTABLE instead of -DPython3_EXECUTABLE to
 control Python version used by CMake when building ESPResSo

---
 .../e/ESPResSo/ESPResSo-4.2.1-foss-2021a-CUDA-11.3.1.eb        | 3 ++-
 easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2021a.eb  | 3 ++-
 .../e/ESPResSo/ESPResSo-4.2.1-foss-2022a-CUDA-11.8.0.eb        | 3 ++-
 easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2022a.eb  | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2021a-CUDA-11.3.1.eb b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2021a-CUDA-11.3.1.eb
index fdd93ce220f..4808bb96632 100644
--- a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2021a-CUDA-11.3.1.eb
+++ b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2021a-CUDA-11.3.1.eb
@@ -29,7 +29,8 @@ dependencies = [
 ]
 
 configopts = ' -DCMAKE_SKIP_RPATH=OFF -DWITH_TESTS=ON -DWITH_CUDA=ON'
-configopts += ' -DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '  # Make sure the right python is used
+# make sure the right Python is used (note: -DPython3_EXECUTABLE or -DPython_EXECUTABLE does not work!)
+configopts += ' -DPYTHON_EXECUTABLE=$EBROOTPYTHON/bin/python '
 
 runtest = 'check_unit_tests && make check_python'
 
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2021a.eb b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2021a.eb
index 48b505bfc9e..edaea20c78c 100644
--- a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2021a.eb
+++ b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2021a.eb
@@ -27,7 +27,8 @@ dependencies = [
 ]
 
 configopts = ' -DCMAKE_SKIP_RPATH=OFF -DWITH_TESTS=ON -DWITH_CUDA=OFF'
-configopts += ' -DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '  # Make sure the right python is used
+# make sure the right Python is used (note: -DPython3_EXECUTABLE or -DPython_EXECUTABLE does not work!)
+configopts += ' -DPYTHON_EXECUTABLE=$EBROOTPYTHON/bin/python '
 
 runtest = 'check_unit_tests && make check_python'
 
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2022a-CUDA-11.8.0.eb b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2022a-CUDA-11.8.0.eb
index e89797a4b16..c524dee3c8c 100644
--- a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2022a-CUDA-11.8.0.eb
+++ b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2022a-CUDA-11.8.0.eb
@@ -29,7 +29,8 @@ dependencies = [
 ]
 
 configopts = ' -DCMAKE_SKIP_RPATH=OFF -DWITH_TESTS=ON -DWITH_CUDA=ON'
-configopts += ' -DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '  # Make sure the right python is used
+# make sure the right Python is used (note: -DPython3_EXECUTABLE or -DPython_EXECUTABLE does not work!)
+configopts += ' -DPYTHON_EXECUTABLE=$EBROOTPYTHON/bin/python '
 
 runtest = 'check_unit_tests && make check_python'
 
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2022a.eb b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2022a.eb
index 6ff43deee93..e5bd5a63f74 100644
--- a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2022a.eb
+++ b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-4.2.1-foss-2022a.eb
@@ -27,7 +27,8 @@ dependencies = [
 ]
 
 configopts = ' -DCMAKE_SKIP_RPATH=OFF -DWITH_TESTS=ON -DWITH_CUDA=OFF'
-configopts += ' -DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python '  # Make sure the right python is used
+# make sure the right Python is used (note: -DPython3_EXECUTABLE or -DPython_EXECUTABLE does not work!)
+configopts += ' -DPYTHON_EXECUTABLE=$EBROOTPYTHON/bin/python '
 
 runtest = 'check_unit_tests && make check_python'