From d207e79dd769f336c70e6d241e898b37bad09851 Mon Sep 17 00:00:00 2001 From: Ivan Santiago Paunovic Date: Mon, 16 May 2022 15:36:44 -0300 Subject: [PATCH] Fix how to find Numpy headers for Windows debug Signed-off-by: Ivan Santiago Paunovic --- .../rosidl_generator_py_generate_interfaces.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake b/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake index e3bb6ac4..e2f51725 100644 --- a/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake +++ b/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake @@ -21,6 +21,11 @@ find_package(PythonInterp 3.6 REQUIRED) find_package(python_cmake_module REQUIRED) find_package(PythonExtra MODULE REQUIRED) +set(_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE}) +if(WIN32 AND "${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE_DEBUG}) +endif() + find_package(Python3 REQUIRED COMPONENTS Development NumPy) # Get a list of typesupport implementations from valid rmw implementations. @@ -127,11 +132,6 @@ endif() set(_target_suffix "__py") -set(_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE}) -if(WIN32 AND "${CMAKE_BUILD_TYPE}" STREQUAL "Debug") - set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE_DEBUG}) -endif() - # move custom command into a subdirectory to avoid multiple invocations on Windows set(_subdir "${CMAKE_CURRENT_BINARY_DIR}/${rosidl_generate_interfaces_TARGET}${_target_suffix}") file(MAKE_DIRECTORY "${_subdir}") @@ -257,6 +257,7 @@ foreach(_typesupport_impl ${_typesupport_impls}) endif() endforeach() +#restore PYTHON_EXECUTABLE value set(PYTHON_EXECUTABLE ${_PYTHON_EXECUTABLE}) # Depend on rosidl_generator_py generated targets from our dependencies