Merge pull request #233 from nim65s/topic/qhull

[CMake] use system Qhull if available

CMakeLists.txt

@@ -108,6 +108,11 @@ if(HPP_FCL_HAS_QHULL)
   if(DEFINED CMAKE_CXX_STANDARD AND CMAKE_CXX_STANDARD EQUAL 98)
     message(FATAL_ERROR "Cannot use qhull library with C++ < 11.\nYou may add -DCMAKE_CXX_STANDARD=11")
   endif()
+  find_package(Qhull COMPONENTS qhull_r qhullcpp)
+  if(Qhull_FOUND)
+    set(HPP_FCL_USE_SYSTEM_QHULL TRUE)
+  else()
+    message(STATUS "Qhullcpp not found: it will be build from sources, if Qhull_r is found")
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/third-parties)
     execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
       ${CMAKE_SOURCE_DIR}/third-parties/qhull/src/libqhullcpp
@@ -122,6 +127,10 @@ if(HPP_FCL_HAS_QHULL)
       NAMES libqhull_r.so
       PATHS ${Qhull_PREFIX}
       )
+    if(NOT Qhull_r_LIBRARY)
+      message(FATAL_ERROR "Qhull_r not found, please install it or turn HPP_FCL_HAS_QHULL OFF")
+    endif()
+  endif()
 endif()
 
 FIND_PACKAGE(assimp REQUIRED)

src/CMakeLists.txt

@@ -85,7 +85,7 @@ if(HPP_FCL_HAS_OCTOMAP)
   list(APPEND ${LIBRARY_NAME}_SOURCES octree.cpp)
 endif(HPP_FCL_HAS_OCTOMAP)
 
-if(HPP_FCL_HAS_QHULL)
+if(HPP_FCL_HAS_QHULL AND NOT HPP_FCL_USE_SYSTEM_QHULL)
   set(
     libqhullcpp_HEADERS
     ${Qhullcpp_PREFIX}/libqhullcpp/Coordinates.h
@@ -188,9 +188,13 @@ ENDIF(WIN32)
 
 if(HPP_FCL_HAS_QHULL)
   target_compile_definitions(${LIBRARY_NAME} PRIVATE -DHPP_FCL_HAS_QHULL)
+  if (HPP_FCL_USE_SYSTEM_QHULL)
+    target_link_libraries(${LIBRARY_NAME} PRIVATE Qhull::qhull_r Qhull::qhullcpp)
+  else()
     target_include_directories(${LIBRARY_NAME} SYSTEM PRIVATE
       ${Qhull_r_INCLUDE_DIR} ${Qhullcpp_PREFIX})
     target_link_libraries(${LIBRARY_NAME} PRIVATE "${Qhull_r_LIBRARY}")
+  endif()
 endif()
 
 target_include_directories(${LIBRARY_NAME}