mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-16 03:09: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>
21 lines
704 B
Diff
21 lines
704 B
Diff
diff --git a/cmake/pcl_options.cmake b/cmake/pcl_options.cmake
|
|
index 6570d75..1d9b0d8 100644
|
|
--- a/cmake/pcl_options.cmake
|
|
+++ b/cmake/pcl_options.cmake
|
|
@@ -7,14 +7,13 @@ if(PCL_SHARED_LIBS)
|
|
set(PCL_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
set(PCL_LIB_TYPE "SHARED")
|
|
# set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
- if(WIN32)
|
|
+ if(0)
|
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX})
|
|
endif()
|
|
else()
|
|
set(PCL_LIB_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
|
|
set(PCL_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
|
|
set(PCL_LIB_TYPE "STATIC")
|
|
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
|
|
endif()
|
|
mark_as_advanced(PCL_SHARED_LIBS)
|
|
|