mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 14:59:03 +08:00
2462a956c8
* Allow FLANN to be build as shared lib * Fix openmvg linking to FLANN * Fix pcl linking to FLANN
28 lines
730 B
Diff
28 lines
730 B
Diff
From 8a7a883b51e18645974921b1bfe9d3b6ef3c626c Mon Sep 17 00:00:00 2001
|
|
From: Lars Glud <larshg@gmail.com>
|
|
Date: Fri, 19 Mar 2021 22:22:57 +0100
|
|
Subject: [PATCH] Add gcc-version-check
|
|
|
|
---
|
|
CMakeLists.txt | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index e5aa7f40a..1e346a316 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -304,6 +304,10 @@ if(NOT PCL_SHARED_LIBS OR ((WIN32 AND NOT MINGW) AND NOT PCL_BUILD_WITH_FLANN_DY
|
|
endif()
|
|
find_package(FLANN 1.7.0 REQUIRED)
|
|
|
|
+if(UNIX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
|
|
+ set (CMAKE_CXX_STANDARD 17)
|
|
+endif()
|
|
+
|
|
# libusb-1.0
|
|
option(WITH_LIBUSB "Build USB RGBD-Camera drivers" TRUE)
|
|
if(WITH_LIBUSB)
|
|
--
|
|
2.29.2.windows.2
|
|
|