Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pcl] Update to 1.10.0 #10042

Merged
merged 8 commits into from
Aug 18, 2020

Conversation

JackBoosY
Copy link
Contributor

@JackBoosY JackBoosY commented Feb 13, 2020

This PR changes:

  • use offical changes to fix compile options (#3604).
  • drop cuda support with x86 arch.
  • drop tools support with static build.

Related: #9986

Note: All features passed in the following triplets test:

  • x86-windows
  • x64-windows
  • x64-windows-static: skip due to unsupported dependency vtk

@JackBoosY JackBoosY added the info:internal This PR or Issue was filed by the vcpkg team. label Feb 13, 2020
@JackBoosY JackBoosY changed the title Dev/jack/update pcl 1.10.0 [pcl] Update to 1.10.0 Feb 13, 2020
-list(APPEND PCL_LIBRARIES ${BOOST_LIBRARIES} ${QHULL_LIBRARIES} ${OPENNI_LIBRARIES} ${OPENNI2_LIBRARIES} ${ENSENSO_LIBRARIES} ${davidSDK_LIBRARIES} ${DSSDK_LIBRARIES} ${RSSDK_LIBRARIES} ${FLANN_LIBRARIES} ${VTK_LIBRARIES})
+list(APPEND PCL_LIBRARIES ${BOOST_LIBRARIES} ${QHULL_LIBRARIES} ${OPENNI_LIBRARIES} ${OPENNI2_LIBRARIES} ${ENSENSO_LIBRARIES} ${davidSDK_LIBRARIES} ${DSSDK_LIBRARIES} ${RSSDK_LIBRARIES} flann::flann_cpp ${VTK_LIBRARIES})
list(APPEND PCL_LIBRARIES ${BOOST_LIBRARIES} ${QHULL_LIBRARIES} ${OPENNI_LIBRARIES} ${OPENNI2_LIBRARIES} ${ENSENSO_LIBRARIES} ${davidSDK_LIBRARIES} ${DSSDK_LIBRARIES} ${RSSDK_LIBRARIES} ${RSSDK2_LIBRARIES} ${VTK_LIBRARIES})
-if (TARGET FLANN::FLANN)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of patching all the FLANN::FLANN targets away. Do the following:

  • do not remove FindFLANN.cmake
  • make/patch FindFLANN to find the flann configs
  • reroute the targets defined by the flann config (e.g. flann::flann_cpp) to be FLANN::FLANN via add_library(FLANN::FLANN ALIAS flann::flann_cpp)
    doing it that way requires less patches

@JackBoosY
Copy link
Contributor Author

JackBoosY commented Feb 13, 2020

@Neumann-A When I try to build install pcl[qt,pcap,cuda,opengl]:x64-windows-static :

Please define _WIN32_WINNT or _WIN32_WINDOWS appropriately. For example:
- add -D_WIN32_WINNT=0x0601 to the compiler command line; or
- add _WIN32_WINNT=0x0601 to your project's Preprocessor Definitions.
Assuming _WIN32_WINNT=0x0601 (i.e. Windows 7 target).
[63/512] C:\PROGRA~2\MICROS~1\2017\PROFES~1\VC\Tools\MSVC\1416~1.270\bin\Hostx64\x64\cl.exe   /TP -DBOOST_LIB_DIAGNOSTIC -DHAVE_PCAP -DPCL_BUILT_WITH_VTK -DvtkRenderingContext2D_AUTOINIT=1(vtkRenderingContextOpenGL2) -DvtkRenderingCore_AUTOINIT=3(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingOpenGL2) -IF:\vcpkg\installed\x64-windows-static\share\vtk\..\..\include -IF:\vcpkg\installed\x64-windows-static\share\vtk\..\..\include\eigen3 -IF:\vcpkg\installed\x64-windows-static\share\vtk\..\..\include\double-conversion -Iinclude -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\common\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\octree\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\openni\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\openni2\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\ensenso\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\davidSDK\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\dssdk\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\rssdk\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\rssdk2\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\pcap\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\png\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\vtk\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\io\include -IF:\vcpkg\installed\x64-windows-static\include\eigen3 -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\recognition\include\pcl\recognition\3rdparty -IF:\vcpkg\installed\x64-windows-static\include /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP  /FS -openmp  /D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1    -DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -DPCL_ONLY_CORE_POINT_TYPES  /bigobj -std:c++14 /showIncludes /Foio\CMakeFiles\pcl_io.dir\src\hdl_grabber.cpp.obj /Fdio\CMakeFiles\pcl_io.dir\pcl_io.pdb /FS -c F:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\io\src\hdl_grabber.cpp
FAILED: io/CMakeFiles/pcl_io.dir/src/hdl_grabber.cpp.obj 
C:\PROGRA~2\MICROS~1\2017\PROFES~1\VC\Tools\MSVC\1416~1.270\bin\Hostx64\x64\cl.exe   /TP -DBOOST_LIB_DIAGNOSTIC -DHAVE_PCAP -DPCL_BUILT_WITH_VTK -DvtkRenderingContext2D_AUTOINIT=1(vtkRenderingContextOpenGL2) -DvtkRenderingCore_AUTOINIT=3(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingOpenGL2) -IF:\vcpkg\installed\x64-windows-static\share\vtk\..\..\include -IF:\vcpkg\installed\x64-windows-static\share\vtk\..\..\include\eigen3 -IF:\vcpkg\installed\x64-windows-static\share\vtk\..\..\include\double-conversion -Iinclude -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\common\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\octree\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\openni\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\openni2\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\ensenso\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\davidSDK\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\dssdk\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\rssdk\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\rssdk2\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\pcap\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\png\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\vtk\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\io\include -IF:\vcpkg\installed\x64-windows-static\include\eigen3 -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\recognition\include\pcl\recognition\3rdparty -IF:\vcpkg\installed\x64-windows-static\include /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP  /FS -openmp  /D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1    -DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -DPCL_ONLY_CORE_POINT_TYPES  /bigobj -std:c++14 /showIncludes /Foio\CMakeFiles\pcl_io.dir\src\hdl_grabber.cpp.obj /Fdio\CMakeFiles\pcl_io.dir\pcl_io.pdb /FS -c F:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\io\src\hdl_grabber.cpp
Microsoft (R) C/C++ Optimizing Compiler Version 19.16.27034 for x64
Copyright (C) Microsoft Corporation.  All rights reserved.

Please define _WIN32_WINNT or _WIN32_WINDOWS appropriately. For example:
- add -D_WIN32_WINNT=0x0601 to the compiler command line; or
- add _WIN32_WINNT=0x0601 to your project's Preprocessor Definitions.
Assuming _WIN32_WINNT=0x0601 (i.e. Windows 7 target).
F:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\io\src\hdl_grabber.cpp(510): warning C4101: 'bind': unreferenced local variable
f:\vcpkg\installed\x64-windows-static\include\boost\variant\detail\forced_return.hpp(43) : error C4716: 'boost::detail::variant::forced_return<boost::variant<boost::shared_ptr<void>,boost::signals2::detail::foreign_void_shared_ptr> >': must return a value
f:\vcpkg\installed\x64-windows-static\include\boost\variant\detail\forced_return.hpp(43) : error C4716: 'boost::detail::variant::forced_return<bool>': must return a value
[64/512] C:\PROGRA~2\MICROS~1\2017\PROFES~1\VC\Tools\MSVC\1416~1.270\bin\Hostx64\x64\cl.exe   /TP -DBOOST_LIB_DIAGNOSTIC -DvtkRenderingContext2D_AUTOINIT=1(vtkRenderingContextOpenGL2) -DvtkRenderingCore_AUTOINIT=3(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingOpenGL2) -IF:\vcpkg\installed\x64-windows-static\share\vtk\..\..\include -IF:\vcpkg\installed\x64-windows-static\share\vtk\..\..\include\eigen3 -IF:\vcpkg\installed\x64-windows-static\share\vtk\..\..\include\double-conversion -Iinclude -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\common\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\search\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\kdtree\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\octree\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\filters\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\2d\include -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\features\include -IF:\vcpkg\installed\x64-windows-static\include\eigen3 -IF:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\recognition\include\pcl\recognition\3rdparty -IF:\vcpkg\installed\x64-windows-static\include /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP  /FS -openmp  /D_DEBUG /MTd /Z7 /Ob0 /Od /RTC1    -DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -DPCL_ONLY_CORE_POINT_TYPES  /bigobj -std:c++14 /showIncludes /Fofeatures\CMakeFiles\pcl_features.dir\src\flare.cpp.obj /Fdfeatures\CMakeFiles\pcl_features.dir\pcl_features.pdb /FS -c F:\vcpkg\buildtrees\pcl\src\c587a5bbcd-ba5710e4c5\features\src\flare.cpp
Microsoft (R) C/C++ Optimizing Compiler Version 19.16.27034 for x64
Copyright (C) Microsoft Corporation.  All rights reserved.

Any ideas?

And I found that PCLAPI_EXPORTS is always defined in windows, whether building dynamic or static libraries.

@PhoebeHui PhoebeHui added the wip label Feb 13, 2020
@NancyLi1013
Copy link
Contributor

Related issue #9765

@Neumann-A
Copy link
Contributor

@Neumann-A No idea. Did not encounter that issue

@JackBoosY JackBoosY mentioned this pull request Feb 13, 2020
@JackBoosY
Copy link
Contributor Author

/azp run

@JackBoosY JackBoosY marked this pull request as ready for review February 20, 2020 13:42
@PhoebeHui
Copy link
Contributor

@JackBoosY, could you reoslve conficts?

@strega-nil strega-nil marked this pull request as draft May 21, 2020 21:51
@JackBoosY JackBoosY added the category:port-update The issue is with a library, which is requesting update new revision label May 22, 2020
@jasjuang
Copy link
Contributor

jasjuang commented Jul 3, 2020

Can we get a pcl 1.11.0 update? Boost is very up to date on vcpkg but it breaks the old 1.9.1 pcl. There are a lot of boost related fixes upstream in the newer version of pcls.

@Neumann-A
Copy link
Contributor

Probably should also add PointCloudLibrary/pcl#4096 as a patch so people don't complain about visualization missing

@JackBoosY
Copy link
Contributor Author

@Neumann-A There are too many changes, I think we should wait to merge them into pcl master.

@JackBoosY JackBoosY added depends:different-pr This PR or Issue depends on a PR which has been filed and removed requires:author-response labels Jul 3, 2020
@JackBoosY
Copy link
Contributor Author

Should wait for #12279 merge.

@JackBoosY JackBoosY removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Jul 7, 2020
@JackBoosY JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label Jul 7, 2020
@JackBoosY JackBoosY marked this pull request as ready for review July 7, 2020 06:21
@JackBoosY
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JackBoosY JackBoosY removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Jul 16, 2020
@bpoebiapl
Copy link

any update?

@JackBoosY
Copy link
Contributor Author

@bpoebiapl Once all test passed, this PR will be merged.

@BillyONeal BillyONeal merged commit b54f17e into microsoft:master Aug 18, 2020
@BillyONeal
Copy link
Member

Thanks for your contribution!

@JackBoosY JackBoosY deleted the dev/jack/update_pcl_1.10.0 branch August 19, 2020 02:09
@bpoebiapl
Copy link

thanks!

remz1337 pushed a commit to remz1337/vcpkg that referenced this pull request Aug 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants