Fix detection of the Ensenso SDK on Windows when the path contains spaces#1875
Merged
taketwo merged 1 commit intoPointCloudLibrary:masterfrom May 30, 2017
Merged
Conversation
Member
|
Thanks, LGTM. |
fbridault
pushed a commit
to fw4spl-org/fw4spl-deps
that referenced
this pull request
Jun 22, 2017
Changes necessary for the Ensenso grabber This MR changes the following: * Add option to build OpenCV with CUDA support, and patch openCV to fix building with CUDA with jom and Ninja on Windows. This is caused by the default install dir for CUDA containing spaces... The patch has been [submitted upstream and merged](opencv/opencv#8819) 🎆 * Patch PCL to find the Ensenso SDK on Windows because... Yeah, spaces. The patch has been [submitted upstream and merged](PointCloudLibrary/pcl#1875). 😄 * Bugfix: in the PCL builder CMake code, replace some `BUILD_X` variables with no effect by the actual variables, `WITH_X` (eg. `BUILD_OPENNI` does nothing, the variable is `WITH_OPENNI`). * Add option to build PCL without CUDA support, to be coherent with what this MR does for OpenCV (currently, PCL is built with CUDA support whenever CUDA is detected). * Fix PCL and OpenCV not being able to build CUDA targets on windows in parallel. The speed gain here is pretty good Before/After: * PCL: 21min/10min * OpenCV: 40min/12min * Ability to set for which CUDA architectures to build dependencies using CUDA. This is not _necessary_, but the build time with CUDA is horribly long, even more so with OpenCV and CUDA support, and this speeds things up quite a bit. By default, build for all SM >= 3.0 architectures (2.x is old and deprecated, I'd be surprised if anyone used this). To speed things up, set it to the architecture of your card **(AND THE GPUS OF THE MACHINES YOU WILL PACKAGE INSTALLERS FOR)** Building PCL + OpenCV + LibSGM (including the aforementioned parallelism improvement): * SM 6.0: 21min * SM 3.0 3.5 3.7 5.0 5.2 5.3 6.0 6.2: ~1h * Add a new optional dependency, libSGM, and a patch that basically rewrites the build system from scratch. Also includes a cmake `FindLibSGM` module. * Windows people who want to show appreciation for the CUDA build speed improvements may send pains au chocolat to @rchavignat. (a man can dream...) See merge request !58
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
By default on Windows, the Ensenso SDK is installed in the
Program Filesdirectory. Searching for it currently fails because of the space inProgram Files. I fixed this by quoting the@ENSENSO_INCLUDE_DIR@placeholder inPCLConfig.cmake.in.