Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
ftl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Nicolas Pope
ftl
Commits
b104ebf9
Commit
b104ebf9
authored
6 years ago
by
Nicolas Pope
Browse files
Options
Downloads
Patches
Plain Diff
Attempt 2 to fix pcl_definitions by removal
parent
c471baef
No related branches found
No related tags found
No related merge requests found
Pipeline
#10513
failed
6 years ago
Stage: test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+0
-1
0 additions, 1 deletion
CMakeLists.txt
renderer/cpp/CMakeLists.txt
+2
-1
2 additions, 1 deletion
renderer/cpp/CMakeLists.txt
with
2 additions
and
2 deletions
CMakeLists.txt
+
0
−
1
View file @
b104ebf9
...
@@ -37,7 +37,6 @@ set(HAVE_OPENCV TRUE)
...
@@ -37,7 +37,6 @@ set(HAVE_OPENCV TRUE)
if
(
PCL_FOUND
)
if
(
PCL_FOUND
)
set
(
HAVE_PCL TRUE
)
set
(
HAVE_PCL TRUE
)
string
(
REPLACE
"
\"
\"
"
""
PCL_DEFINITIONS
${
PCL_DEFINITIONS
}
)
endif
()
endif
()
# Readline library is not required on Windows
# Readline library is not required on Windows
...
...
This diff is collapsed.
Click to expand it.
renderer/cpp/CMakeLists.txt
+
2
−
1
View file @
b104ebf9
...
@@ -2,7 +2,8 @@ add_library(ftlrender
...
@@ -2,7 +2,8 @@ add_library(ftlrender
src/display.cpp
src/display.cpp
)
)
target_compile_options
(
ftlrender PUBLIC
${
PCL_DEFINITIONS
}
)
# These cause errors in CI build and are being removed from PCL in newer versions
# target_compile_options(ftlrender PUBLIC ${PCL_DEFINITIONS})
target_include_directories
(
ftlrender PUBLIC
target_include_directories
(
ftlrender PUBLIC
${
PCL_INCLUDE_DIRS
}
${
PCL_INCLUDE_DIRS
}
...
...
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