apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed colcon build not detected on buildfarm

Browse Source
This commit is contained in:
matlabbe 2022-12-12 08:29:54 -08:00
parent e0328f0261
commit 635efcd622
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -8,11 +8,15 @@ IF(CATKIN_TOPLEVEL OR CATKIN_BUILD_BINARY_PACKAGE OR CATKIN_SKIP_TESTING OR CATK
SET(CATKIN_BUILD TRUE) SET(CATKIN_BUILD TRUE)
ELSE() ELSE()
# Detect if it is called by colcon (ros2) # Detect if it is called by colcon (ros2)
IF(DEFINED AMENT_PREFIX_PATH) # buildfarm
SET(COLCON_BUILD TRUE)
ELSE() # colcon local build in ros2_ws
string(FIND ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} POS) string(FIND ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} POS)
IF(${POS} EQUAL -1) IF(${POS} EQUAL -1)
SET(COLCON_BUILD TRUE) SET(COLCON_BUILD TRUE)
ENDIF() ENDIF()
ENDIF() ENDIF()
ENDIF()
MESSAGE(STATUS "CATKIN_BUILD=${CATKIN_BUILD}") MESSAGE(STATUS "CATKIN_BUILD=${CATKIN_BUILD}")
MESSAGE(STATUS "COLCON_BUILD=${COLCON_BUILD}") MESSAGE(STATUS "COLCON_BUILD=${COLCON_BUILD}")