From 0cf4156b6e835d457f3787d3465dcae83ed9ae31 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Sun, 3 Apr 2022 01:46:25 -0700 Subject: [PATCH 1/2] IgnPython: restore PYTHON_EXECUTABLE for now The PYTHON_EXECUTABLE cmake variable was replaced by Python3_EXECUTABLE in #218 for new versions of cmake. This breaks packages currently using the previous variable name. This restores PYTHON_EXECUTABLE to allow a tick-tock cycle for downstream packages to transition. Signed-off-by: Steve Peters --- cmake/IgnPython.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/IgnPython.cmake b/cmake/IgnPython.cmake index 57e4362a..1f9b626e 100644 --- a/cmake/IgnPython.cmake +++ b/cmake/IgnPython.cmake @@ -36,4 +36,9 @@ else() set(Python3_Interpreter_FOUND ${PYTHONINTERP_FOUND}) set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE}) endif() -endif() \ No newline at end of file +endif() + +# Tick-tock PYTHON_EXECUTABLE until Python3_EXECUTABLE is released +if(Python3_EXECUTABLE AND NOT PYTHON_EXECUTABLE) + set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) +endif() From 7d3cc9c3363852d2c3e8b355d6c1403eb99e7ec8 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 4 Apr 2022 16:57:16 +0200 Subject: [PATCH 2/2] Add a TODO for ign-cmake3 --- cmake/IgnPython.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/IgnPython.cmake b/cmake/IgnPython.cmake index 1f9b626e..6ad11801 100644 --- a/cmake/IgnPython.cmake +++ b/cmake/IgnPython.cmake @@ -39,6 +39,7 @@ else() endif() # Tick-tock PYTHON_EXECUTABLE until Python3_EXECUTABLE is released +# TODO(jrivero) ign-cmake3: start the deprecation cycle of PYTHON_EXECUTABLE if(Python3_EXECUTABLE AND NOT PYTHON_EXECUTABLE) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) endif()