mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-14 11:39:22 +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>
32 lines
894 B
Diff
32 lines
894 B
Diff
From a9f8c032bb7915c075f0fb32a0bbfa633ca3b388 Mon Sep 17 00:00:00 2001
|
|
Date: Wed, 7 Jul 2021 15:13:43 -0400
|
|
Subject: [PATCH] Fix Qt
|
|
|
|
---
|
|
CMakeLists.txt | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 5cdae617..fe98199b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -966,13 +966,13 @@ IF(ANDROID)
|
|
IF(BUILD_APP)
|
|
ADD_SUBDIRECTORY( app )
|
|
ENDIF(BUILD_APP)
|
|
+ELSEIF(NOT WITH_QT)
|
|
+ MESSAGE(WARNING "the GUI lib and the stand-alone application will not be compiled...")
|
|
ELSEIF(Qt5_FOUND OR (QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND))
|
|
ADD_SUBDIRECTORY( guilib )
|
|
IF(BUILD_APP)
|
|
ADD_SUBDIRECTORY( app )
|
|
ENDIF(BUILD_APP)
|
|
-ELSEIF(WITH_QT)
|
|
- MESSAGE(WARNING "Qt not found, the GUI lib and the stand-alone application will not be compiled...")
|
|
ENDIF()
|
|
|
|
IF(BUILD_TOOLS)
|
|
--
|
|
2.32.0.windows.1
|
|
|