Merge branch 'devel' into release/4.15.0

humanoid-path-planner · Jan 18, 2023 · 44bc5ed · 44bc5ed
2 parents bd932cf + 75471dc
commit 44bc5ed
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,10 +26,12 @@ include(cmake/python.cmake)
 compute_project_args(PROJECT_ARGS LANGUAGES CXX)
 project(${PROJECT_NAME} ${PROJECT_ARGS})
 
-findpython()
-
 add_project_dependency("hpp-manipulation-corba" REQUIRED)
 
+if(NOT FINDPYTHON_ALREADY_CALLED)
+  findpython()
+endif()
+
 add_subdirectory(src)
 
 set(CATKIN_PACKAGE_SHARE_DESTINATION