Skip to content

Commit

Permalink
Fix building FreeCAD with PCL
Browse files Browse the repository at this point in the history
PCLConfig also calls find_package for boost, but with different
components
  • Loading branch information
peterlama committed Oct 30, 2014
1 parent 76906d2 commit f9e6efa
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions CMakeLists.txt
Expand Up @@ -161,6 +161,7 @@ else(MSVC)
set(FREECAD_USE_3DCONNEXION OFF)
OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" ON)
OPTION(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" OFF)
OPTION(FREECAD_USE_PCL "Build the features that use PCL libs" OFF)
endif(MSVC)

# if this is set override some options
Expand Down Expand Up @@ -389,7 +390,12 @@ else(FREECAD_LIBPACK_USE)
MESSAGE("Python not found, install python!")
ENDIF(NOT PYTHONLIBS_FOUND)


# -------------------------------- pcl ----------------------------------
#PCL needs to be found before boost because the PCLConfig also calls find_package(Boost ...),
#but with different components
if(FREECAD_USE_PCL)
find_package(PCL REQUIRED COMPONENTS common kdtree features surface io)
endif(FREECAD_USE_PCL)

# -------------------------------- Boost --------------------------------

Expand Down Expand Up @@ -527,13 +533,6 @@ else(FREECAD_LIBPACK_USE)

find_package(Eigen3)

# -------------------------------- pcl ----------------------------------

find_package(PCL QUIET COMPONENTS common kdtree features surface io)
if (NOT PCL_FOUND)
MESSAGE("-- pcl not found")
endif(NOT PCL_FOUND)

# -------------------------------- ODE ----------------------------------

# find_package(ODE)
Expand Down

0 comments on commit f9e6efa

Please sign in to comment.