Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change building of nurbs component due to weird cmake issue #100

Closed
wants to merge 3 commits into from
Closed

Change building of nurbs component due to weird cmake issue #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8863ac3
Change building of nurbs component due to weird cmake issue
Levi-Armstrong Aug 6, 2020
3641004
fixup
Levi-Armstrong Aug 6, 2020
16cc98d
Update .travis.yml
Levi-Armstrong Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ env:
matrix:
include:
- env: ROS_DISTRO=kinetic DOCKER_IMAGE=rosindustrial/noether:kinetic
- env: ROS_DISTRO=melodic DOCKER_IMAGE=rosindustrial/noether:melodic TARGET_CMAKE_ARGS="-DNURBS_FOUND=true"
- env: ROS_DISTRO=noetic DOCKER_IMAGE=rosindustrial/noether:noetic
- env: ROS_DISTRO=melodic DOCKER_IMAGE=rosindustrial/noether:melodic TARGET_CMAKE_ARGS="-DENABLE_NURBS=ON"
- env: ROS_DISTRO=noetic DOCKER_IMAGE=rosindustrial/noether:noetic TARGET_CMAKE_ARGS="-DENABLE_NURBS=ON"
- env: ROS_DISTRO=noetic
allow_failures:
- env: ROS_DISTRO=kinetic DOCKER_IMAGE=rosindustrial/noether:kinetic
Expand Down
18 changes: 3 additions & 15 deletions noether_filtering/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,8 @@ find_package(console_bridge REQUIRED)
find_package(pluginlib REQUIRED)
find_package(xmlrpcpp REQUIRED)

# Check if PCL was compiled with OpenNURBS
if(NOT DEFINED NURBS_FOUND)
try_compile(
NURBS_FOUND
${CMAKE_CURRENT_BINARY_DIR}/pcl_nurbs_try_compile
${CMAKE_CURRENT_SOURCE_DIR}/cmake/test_scripts/check_pcl_nurbs.cpp
CMAKE_FLAGS ${CMAKE_FLAGS} -DINCLUDE_DIRECTORIES=${PCL_INCLUDE_DIRS}
LINK_LIBRARIES ${PCL_LIBRARIES}
)
if (NOT ${NURBS_FOUND})
message("PCL NURBS NOT FOUND")
else()
message("PCL NURBS FOUND")
endif()
if (NOT ENABLE_NURBS)
set(ENABLE_NURBS, OFF)
endif()

###########
Expand Down Expand Up @@ -80,7 +68,7 @@ if(${BUILD_MESH_PLUGINS})
)
set(MESH_FILTERS_COMPILE_DEFINITIONS "")

if (${NURBS_FOUND})
if (ENABLE_NURBS)
list(APPEND MESH_FILTERS_SRC src/mesh/bspline_reconstruction.cpp)
list(APPEND MESH_FILTERS_COMPILE_DEFINITIONS ENABLE_NURBS)
endif()
Expand Down