yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: move jinja2 check to Python modules

Browse Source 
This removes the cmake check for jinja2 and moves it to the respective
Python scripts.
This commit is contained in:
Julian Oes
2020-01-15 10:38:14 +01:00
parent b04f68553e
commit c77816aef2
4 changed files with 22 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -263,10 +263,9 @@ if (CATKIN_DEVEL_PREFIX)
endif()
endif()
# python
# Python
# If using catkin, Python 2 is found since it points
# to the Python libs installed with the ROS distro
include(px4_find_python_module)
if (NOT CATKIN_DEVEL_PREFIX)
find_package(PythonInterp 3 REQUIRED)
else()
@@ -277,9 +276,6 @@ option(PYTHON_COVERAGE "Python code coverage" OFF)
if(PYTHON_COVERAGE)
message(STATUS "python coverage enabled")
set(PYTHON_EXECUTABLE coverage run -p)
else()
# run normally (broken under coveragepy)
px4_find_python_module(jinja2 REQUIRED)
endif()
#=============================================================================