Skip to content

Commit 4824c7c

Browse files
committed
zdepth skip building kinetic
1 parent d855614 commit 4824c7c

File tree

2 files changed

+40
-33
lines changed

2 files changed

+40
-33
lines changed

3rdparty/zdepth/CMakeLists.txt

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,18 @@ project(zdepth)
33

44
include(ExternalProject)
55

6-
ExternalProject_Add(
7-
zdepth
8-
GIT_REPOSITORY https://github.com/catid/Zdepth.git
9-
GIT_TAG ac7c6d8e944d07be2404e5a1eaa04562595f3756
10-
GIT_SHALLOW TRUE
11-
PATCH_COMMAND cat ${PROJECT_SOURCE_DIR}/fix_cmakelists.patch | patch -p1
12-
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
13-
INSTALL_COMMAND echo "install"
14-
)
6+
if("$ENV{ROS_DISTRO}" STRGREATER "kinetic")
7+
ExternalProject_Add(
8+
zdepth
9+
GIT_REPOSITORY https://github.com/catid/Zdepth.git
10+
GIT_TAG ac7c6d8e944d07be2404e5a1eaa04562595f3756
11+
GIT_SHALLOW TRUE
12+
PATCH_COMMAND cat ${PROJECT_SOURCE_DIR}/fix_cmakelists.patch | patch -p1
13+
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
14+
INSTALL_COMMAND echo "install"
15+
)
1516

16-
17-
install(CODE "execute_process(COMMAND make install WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zdepth-prefix/src/zdepth-build)")
17+
install(CODE "execute_process(COMMAND make install WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zdepth-prefix/src/zdepth-build)")
18+
else()
19+
install(CODE "message(WARNING \"Skipping zdepth install because ROS is too old\")")
20+
endif()

zdepth_image_transport/CMakeLists.txt

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ find_package(catkin REQUIRED
1111
std_msgs
1212
)
1313

14-
find_library(zdepth_LIB zdepth PATH_SUFFIXES zdepth)
15-
find_library(zstd_LIB zstd PATH_SUFFIXES zdepth)
16-
set(zdepth_LIBRARIES ${zdepth_LIB} ${zstd_LIB})
17-
find_file(zdepth_INCLUDE zdepth.hpp PATH_SUFFIXES zdepth)
18-
get_filename_component(zdepth_PATH ${zdepth_INCLUDE} DIRECTORY)
19-
get_filename_component(zdepth_INCLUDE_DIRS ${zdepth_PATH} DIRECTORY)
14+
if("$ENV{ROS_DISTRO}" STRGREATER "kinetic")
15+
find_library(zdepth_LIB zdepth PATH_SUFFIXES zdepth)
16+
find_library(zstd_LIB zstd PATH_SUFFIXES zdepth)
17+
set(zdepth_LIBRARIES ${zdepth_LIB} ${zstd_LIB})
18+
find_file(zdepth_INCLUDE zdepth.hpp PATH_SUFFIXES zdepth)
19+
get_filename_component(zdepth_PATH ${zdepth_INCLUDE} DIRECTORY)
20+
get_filename_component(zdepth_INCLUDE_DIRS ${zdepth_PATH} DIRECTORY)
21+
endif()
2022

2123
add_message_files(
2224
DIRECTORY msg
@@ -41,26 +43,28 @@ catkin_package(
4143
zdepth
4244
)
4345

44-
include_directories(include ${catkin_INCLUDE_DIRS} ${zdepth_INCLUDE_DIRS})
46+
if("$ENV{ROS_DISTRO}" STRGREATER "kinetic")
47+
include_directories(include ${catkin_INCLUDE_DIRS} ${zdepth_INCLUDE_DIRS})
4548

46-
add_executable(zdepth_test src/test/zdepth_test.cpp)
47-
target_link_libraries(zdepth_test ${catkin_LIBRARIES} ${zdepth_LIBRARIES})
49+
add_executable(zdepth_test src/test/zdepth_test.cpp)
50+
target_link_libraries(zdepth_test ${catkin_LIBRARIES} ${zdepth_LIBRARIES})
4851

49-
add_library(${PROJECT_NAME} src/manifest.cpp src/zdepth_publisher.cpp src/zdepth_subscriber.cpp)
50-
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${zdepth_LIBRARIES})
51-
add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_generate_messages_cpp)
52+
add_library(${PROJECT_NAME} src/manifest.cpp src/zdepth_publisher.cpp src/zdepth_subscriber.cpp)
53+
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${zdepth_LIBRARIES})
54+
add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_generate_messages_cpp)
5255

53-
install(TARGETS zdepth_test
54-
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
55-
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
56-
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
57-
)
56+
install(TARGETS zdepth_test
57+
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
58+
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
59+
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
60+
)
5861

59-
install(TARGETS ${PROJECT_NAME}
60-
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
61-
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
62-
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
63-
)
62+
install(TARGETS ${PROJECT_NAME}
63+
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
64+
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
65+
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
66+
)
67+
endif()
6468

6569
install(DIRECTORY include/${PROJECT_NAME}/
6670
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}

0 commit comments

Comments
 (0)