-
Notifications
You must be signed in to change notification settings - Fork 285
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix linking error of FLANN on Ubuntu Disco (#1221)
FLANN requires `lz4` to be linked, but it's not explicitly linked by the upstream. Depends on #1220 *** **Before merging a pull request** - [x] Set version target by selecting a milestone on the right side - [x] Summarize this change in `CHANGELOG.md`
- Loading branch information
Showing
10 changed files
with
91 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
FROM ubuntu:disco |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
REPO_SLUG | ||
IS_PULL_REQUEST | ||
OS_NAME | ||
BUILD_DIR | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# Copyright (c) 2011-2019, The DART development contributors | ||
# All rights reserved. | ||
# | ||
# The list of contributors can be found at: | ||
# https://github.com/dartsim/dart/blob/master/LICENSE | ||
# | ||
# This file is provided under the "BSD-style" License | ||
|
||
find_package(lz4 QUIET) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
# Copyright (c) 2011-2019, The DART development contributors | ||
# All rights reserved. | ||
# | ||
# The list of contributors can be found at: | ||
# https://github.com/dartsim/dart/blob/master/LICENSE | ||
# | ||
# This file is provided under the "BSD-style" License | ||
|
||
# Find lz4 | ||
# | ||
# This sets the following variables: | ||
# lz4_FOUND | ||
# lz4_INCLUDE_DIRS | ||
# lz4_LIBRARIES | ||
# lz4_VERSION | ||
# | ||
# and the following targets: | ||
# lz4 | ||
|
||
find_package(PkgConfig QUIET) | ||
|
||
# Check to see if pkgconfig is installed. | ||
pkg_check_modules(PC_lz4 lz4 QUIET) | ||
|
||
# Include directories | ||
find_path(lz4_INCLUDE_DIRS | ||
NAMES lz4.h | ||
HINTS ${PC_lz4_INCLUDEDIR} | ||
PATHS "${CMAKE_INSTALL_PREFIX}/include") | ||
|
||
# Libraries | ||
find_library(lz4_LIBRARIES lz4 | ||
HINTS ${PC_lz4_LIBDIR}) | ||
|
||
# Version | ||
set(lz4_VERSION ${PC_lz4_VERSION}) | ||
|
||
# Set (NAME)_FOUND if all the variables and the version are satisfied. | ||
include(FindPackageHandleStandardArgs) | ||
find_package_handle_standard_args(lz4 | ||
FAIL_MESSAGE DEFAULT_MSG | ||
REQUIRED_VARS lz4_INCLUDE_DIRS lz4_LIBRARIES | ||
VERSION_VAR lz4_VERSION) | ||
|
||
if(lz4_FOUND AND NOT TARGET lz4) | ||
add_library(lz4 INTERFACE IMPORTED) | ||
set_target_properties(lz4 PROPERTIES | ||
INTERFACE_INCLUDE_DIRECTORIES "${lz4_INCLUDE_DIRS}" | ||
INTERFACE_LINK_LIBRARIES "${lz4_LIBRARIES}" | ||
) | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters