mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:17:50 +08:00
8acb35e27f
* [pcl] Update patches and portfile for PCL 1.12.0.99
* [pcl] Update pcl to 1.12.0.99
* Update rtabmap to 0.20.13, don't build Qt libs when WITH_QT is OFF
* [rtabmap] update to 0.20.13
* Use PCL 1.12.0 instead of 1.12.0.99
* [pcl] Use PCL 1.12.0
* Require pcl[vtk] to build rtabmap
* Fix rtabmap hash
* Go back to ccc8202, where Linux CI was passing, update rtabmap to require pcl[vtk]
* test - go back to pcl 1.20.0.99
* That wasn't it - go back to PCL release commit
* Go back to pcl 1.12.0
* Remove libpng patch due to updated VTK per https://github.com/microsoft/vcpkg/pull/18855#issuecomment-880989289
* Bump version as per git bot
* Fix find dependencies in pcl's dependency
* version stuff
* version
* Replace depreciate functions
* version
* Add DISABLE_PARALLEL_CONFIGURE to rtabmap
* version
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
28 lines
809 B
Diff
28 lines
809 B
Diff
From 116e665df611242ea0575a62478c31ec03e78fcc Mon Sep 17 00:00:00 2001
|
|
From: raahilsha-z <raahil.sha@zimaging.io>
|
|
Date: Wed, 7 Jul 2021 15:53:49 -0400
|
|
Subject: [PATCH] add gcc version check
|
|
|
|
---
|
|
CMakeLists.txt | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 63b38df68..29f79d31b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -311,6 +311,10 @@ if(NOT (${FLANN_LIBRARY_TYPE} MATCHES ${PCL_FLANN_REQUIRED_TYPE}) AND NOT (${PCL
|
|
message(FATAL_ERROR "Flann was selected with ${PCL_FLANN_REQUIRED_TYPE} but found as ${FLANN_LIBRARY_TYPE}")
|
|
endif()
|
|
|
|
+if(UNIX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
|
|
+ set (CMAKE_CXX_STANDARD 17)
|
|
+endif()
|
|
+
|
|
# libusb
|
|
option(WITH_LIBUSB "Build USB RGBD-Camera drivers" TRUE)
|
|
if(WITH_LIBUSB)
|
|
--
|
|
2.32.0.windows.1
|
|
|