mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 05:49:00 +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>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 6f4e2fea829b5986863403d6a611c52c5ac8b2a9 Mon Sep 17 00:00:00 2001
|
|
From: raahilsha-z <raahil.sha@zimaging.io>
|
|
Date: Wed, 7 Jul 2021 16:00:30 -0400
|
|
Subject: [PATCH] pcl_utils
|
|
|
|
---
|
|
cmake/pcl_utils.cmake | 13 ++-----------
|
|
1 file changed, 2 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
|
|
index d87d02da9..7c951bfd5 100644
|
|
--- a/cmake/pcl_utils.cmake
|
|
+++ b/cmake/pcl_utils.cmake
|
|
@@ -94,21 +94,12 @@ macro(SET_INSTALL_DIRS)
|
|
if(NOT DEFINED LIB_INSTALL_DIR)
|
|
set(LIB_INSTALL_DIR "lib")
|
|
endif()
|
|
- if(NOT ANDROID)
|
|
- set(INCLUDE_INSTALL_ROOT
|
|
- "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
|
- else()
|
|
- set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
|
|
- endif()
|
|
+ set(INCLUDE_INSTALL_ROOT "include")
|
|
set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl")
|
|
set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
|
set(BIN_INSTALL_DIR "bin")
|
|
set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig")
|
|
- if(WIN32 AND NOT MINGW)
|
|
- set(PCLCONFIG_INSTALL_DIR "cmake")
|
|
- else()
|
|
- set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
|
- endif()
|
|
+ set(PCLCONFIG_INSTALL_DIR "share/pcl")
|
|
endmacro()
|
|
|
|
|
|
--
|
|
2.32.0.windows.1
|
|
|