Skip to content

Commit 4b50b98

Browse files
authored
uss python_install_dir (#178)
Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>
1 parent cf8d2fb commit 4b50b98

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

generate_parameter_library/cmake/generate_parameter_library.cmake

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,9 @@ function(generate_parameter_module LIB_NAME YAML_FILE)
110110
set(LIB_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME})
111111
file(MAKE_DIRECTORY ${LIB_INCLUDE_DIR})
112112

113-
find_package(PythonInterp REQUIRED)
114-
execute_process(
115-
COMMAND "${PYTHON_EXECUTABLE}" -c "import sys;v = sys.version.split()[0];v = v.split('.');print(f'python{v[0]}.{v[1]}')"
116-
OUTPUT_VARIABLE PYTHON_VERSION
117-
OUTPUT_STRIP_TRAILING_WHITESPACE)
118-
119-
set(PARAM_HEADER_FILE ${CMAKE_INSTALL_PREFIX}/local/lib/${PYTHON_VERSION}/dist-packages/${PROJECT_NAME}/${LIB_NAME}.py)
120-
113+
find_package(ament_cmake_python)
114+
ament_get_python_install_dir(python_install_dir)
115+
set(PARAM_HEADER_FILE ${CMAKE_INSTALL_PREFIX}/${python_install_dir}/${PROJECT_NAME}/${LIB_NAME}.py)
121116

122117
# Generate the module for the python
123118
add_custom_command(

0 commit comments

Comments
 (0)