Skip to content

Commit

Permalink
CMake: Fix issue with vtk config files when looking for the pcl com…
Browse files Browse the repository at this point in the history
…ponent
  • Loading branch information
drdanz committed Jun 13, 2018
1 parent 641aa4a commit 74a526f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cmake/template/YARPConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -148,20 +148,20 @@ endif()

# Find all requested components
set(YARP_LIBRARIES YARP::YARP_init)
foreach(_module ${YARP_FIND_COMPONENTS})
foreach(_yarp_module ${YARP_FIND_COMPONENTS})
# FIXME Remove this check when CMake 3.9 or later is required
if (CMAKE_VERSION VERSION_LESS 3.9)
find_package(YARP_${_module}
find_package(YARP_${_yarp_module}
${_YARP_FIND_PARTS_QUIET}
${_YARP_FIND_PARTS_REQUIRED}
HINTS "${YARP_CMAKECONFIG_DIR}"
NO_DEFAULT_PATH)
else()
find_dependency(YARP_${_module}
find_dependency(YARP_${_yarp_module}
HINTS "${YARP_CMAKECONFIG_DIR}"
NO_DEFAULT_PATH)
endif()
list(APPEND YARP_LIBRARIES YARP::YARP_${_module})
list(APPEND YARP_LIBRARIES YARP::YARP_${_yarp_module})
endforeach()

# Ensure that all requested modules are available
Expand Down
5 changes: 5 additions & 0 deletions doc/release/v3_0_1.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ A (partial) list of bug fixed and issues resolved in this release can be found
Bug Fixes
---------

### Build System

* Fixed issue with vtk config files when looking for the `pcl` component


### Libraries

#### YARP_pcl
Expand Down

0 comments on commit 74a526f

Please sign in to comment.