1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Fri, 27 Mar 2020 13:35:51 +0100
Subject: Make Python version variable for pybuild
---
utilities/roslz4/CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/utilities/roslz4/CMakeLists.txt b/utilities/roslz4/CMakeLists.txt
index e5099d5..79d77bf 100644
--- a/utilities/roslz4/CMakeLists.txt
+++ b/utilities/roslz4/CMakeLists.txt
@@ -41,8 +41,8 @@ target_link_libraries(roslz4 ${lz4_LIBRARIES} ${catkin_LIBRARIES})
if(NOT ANDROID)
# Python bindings
-set(Python_ADDITIONAL_VERSIONS "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
-find_package(PythonLibs "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" REQUIRED)
+set(Python_ADDITIONAL_VERSIONS "${PYVER}")
+find_package(PythonLibs "${PYVER}" REQUIRED)
include_directories(${PYTHON_INCLUDE_PATH})
add_library(roslz4_py src/_roslz4module.c)
@@ -76,6 +76,7 @@ install(TARGETS roslz4
)
if(NOT ANDROID)
+set(CATKIN_PACKAGE_PYTHON_DESTINATION lib/python${PYVER}/${PYTHON_PACKAGES_DIR}/${PROJECT_NAME})
install(TARGETS roslz4_py
ARCHIVE DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}
|
