Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
coal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Coal
coal
Commits
5ee666ad
Unverified
Commit
5ee666ad
authored
1 year ago
by
Justin Carpentier
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #475 from humanoid-path-planner/osx-rpath
fix RPATH for OSX
parents
3374066f
6c5c5be1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#33025
passed with warnings
1 year ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-2
3 additions, 2 deletions
CMakeLists.txt
src/CMakeLists.txt
+4
-1
4 additions, 1 deletion
src/CMakeLists.txt
with
7 additions
and
3 deletions
CMakeLists.txt
+
3
−
2
View file @
5ee666ad
...
...
@@ -138,10 +138,10 @@ if(octomap_FOUND)
list
(
GET VERSION_LIST 0 OCTOMAP_MAJOR_VERSION
)
list
(
GET VERSION_LIST 1 OCTOMAP_MINOR_VERSION
)
list
(
GET VERSION_LIST 2 OCTOMAP_PATCH_VERSION
)
message
(
STATUS
"FCL uses Octomap"
)
message
(
STATUS
"
HPP-
FCL uses Octomap"
)
else
()
SET
(
HPP_FCL_HAS_OCTOMAP FALSE
)
message
(
STATUS
"FCL does not use Octomap"
)
message
(
STATUS
"
HPP-
FCL does not use Octomap"
)
endif
()
option
(
HPP_FCL_HAS_QHULL
"use qhull library to compute convex hulls."
FALSE
)
...
...
@@ -149,6 +149,7 @@ if(HPP_FCL_HAS_QHULL)
find_package
(
Qhull COMPONENTS qhull_r qhullcpp
)
if
(
Qhull_FOUND
)
set
(
HPP_FCL_USE_SYSTEM_QHULL TRUE
)
message
(
STATUS
"HPP-FCL uses system Qhull"
)
else
()
message
(
STATUS
"Qhullcpp not found: it will be build from sources, if Qhull_r is found"
)
file
(
MAKE_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/third-parties
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
4
−
1
View file @
5ee666ad
...
...
@@ -173,7 +173,10 @@ add_library(${LIBRARY_NAME}
${${
LIBRARY_NAME
}
_SOURCES
}
)
set_target_properties
(
${
PROJECT_NAME
}
PROPERTIES INSTALL_RPATH
"
\$
ORIGIN"
)
if
(
UNIX
)
get_relative_rpath
(
${
CMAKE_INSTALL_FULL_LIBDIR
}
${
PROJECT_NAME
}
_INSTALL_RPATH
)
set_target_properties
(
${
PROJECT_NAME
}
PROPERTIES INSTALL_RPATH
"
${${
PROJECT_NAME
}
_INSTALL_RPATH
}
"
)
endif
()
# IDE sources and headers sorting
ADD_SOURCE_GROUP
(
${
LIBRARY_NAME
}
_SOURCES
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment