diff --git a/cmake/catkin_package_xml.cmake b/cmake/catkin_package_xml.cmake index 8c7c026ad..99dc212ad 100644 --- a/cmake/catkin_package_xml.cmake +++ b/cmake/catkin_package_xml.cmake @@ -60,7 +60,7 @@ macro(_catkin_package_xml dest_dir) # stamp and parse package.xml stamp(${_PACKAGE_XML_DIRECTORY}/package.xml) file(MAKE_DIRECTORY ${dest_dir}) - safe_execute_process(COMMAND + safe_execute_process(COMMAND ${PYTHON_EXECUTABLE} ${catkin_EXTRAS_DIR}/parse_package_xml.py ${_PACKAGE_XML_DIRECTORY}/package.xml ${dest_dir}/package.cmake) diff --git a/cmake/catkin_python_setup.cmake b/cmake/catkin_python_setup.cmake index dfea73bd1..2a8a0f755 100644 --- a/cmake/catkin_python_setup.cmake +++ b/cmake/catkin_python_setup.cmake @@ -59,7 +59,7 @@ function(catkin_python_setup) assert(CATKIN_ENV) assert(PYTHON_EXECUTABLE) set(cmd - ${CATKIN_ENV} + ${CATKIN_ENV} ${PYTHON_EXECUTABLE} ${catkin_EXTRAS_DIR}/interrogate_setup_dot_py.py ${PROJECT_NAME} ${${PROJECT_NAME}_SOURCE_DIR}/setup.py diff --git a/cmake/interrogate_setup_dot_py.py b/cmake/interrogate_setup_dot_py.py old mode 100755 new mode 100644 diff --git a/cmake/list_insert_in_workspace_order.cmake b/cmake/list_insert_in_workspace_order.cmake index 53745802f..57ade4a49 100644 --- a/cmake/list_insert_in_workspace_order.cmake +++ b/cmake/list_insert_in_workspace_order.cmake @@ -19,7 +19,7 @@ macro(list_insert_in_workspace_order listname) assert(CATKIN_ENV) assert(PYTHON_EXECUTABLE) set(cmd - ${CATKIN_ENV} + ${CATKIN_ENV} ${PYTHON_EXECUTABLE} ${catkin_EXTRAS_DIR}/order_paths.py ${${PROJECT_NAME}_BINARY_DIR}/catkin_generated/ordered_paths.cmake --paths-to-order ${ARGN} diff --git a/cmake/order_paths.py b/cmake/order_paths.py old mode 100755 new mode 100644 diff --git a/cmake/python.cmake b/cmake/python.cmake index 122ce8f44..6a7617ec5 100644 --- a/cmake/python.cmake +++ b/cmake/python.cmake @@ -1,7 +1,7 @@ # the CMake variable PYTHON_INSTALL_DIR has the same value as the Python function catkin.builder.get_python_install_dir() find_package(PythonInterp REQUIRED) -execute_process(COMMAND ${catkin_EXTRAS_DIR}/python_version.py +execute_process(COMMAND ${PYTHON_EXECUTABLE} ${catkin_EXTRAS_DIR}/python_version.py OUTPUT_VARIABLE PYTHON_VERSION_XDOTY OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/cmake/python_version.py b/cmake/python_version.py old mode 100755 new mode 100644