Skip to content

Commit 44bc5ed

Browse files
committed
Merge branch 'devel' into release/4.15.0
2 parents bd932cf + 75471dc commit 44bc5ed

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ include(cmake/python.cmake)
2626
compute_project_args(PROJECT_ARGS LANGUAGES CXX)
2727
project(${PROJECT_NAME} ${PROJECT_ARGS})
2828

29-
findpython()
30-
3129
add_project_dependency("hpp-manipulation-corba" REQUIRED)
3230

31+
if(NOT FINDPYTHON_ALREADY_CALLED)
32+
findpython()
33+
endif()
34+
3335
add_subdirectory(src)
3436

3537
set(CATKIN_PACKAGE_SHARE_DESTINATION

0 commit comments

Comments
 (0)