From b104ebf94b6899c597bc900eb4f8205b699f35b8 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Wed, 8 May 2019 09:11:30 +0100
Subject: [PATCH] Attempt 2 to fix pcl_definitions by removal
---
CMakeLists.txt | 1 -
renderer/cpp/CMakeLists.txt | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f678b0a4a..c9df3a808 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,6 @@ set(HAVE_OPENCV TRUE)
if (PCL_FOUND)
set(HAVE_PCL TRUE)
- string(REPLACE "\" \"" "" PCL_DEFINITIONS ${PCL_DEFINITIONS})
endif()
# Readline library is not required on Windows
diff --git a/renderer/cpp/CMakeLists.txt b/renderer/cpp/CMakeLists.txt
index d5a13f4aa..6453c92a6 100644
--- a/renderer/cpp/CMakeLists.txt
+++ b/renderer/cpp/CMakeLists.txt
@@ -2,7 +2,8 @@ add_library(ftlrender
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
${PCL_INCLUDE_DIRS}
--
GitLab