From cef4a1742fe8d1367f62cf33c0eb4782f0ac15a5 Mon Sep 17 00:00:00 2001
From: Fabian Paus <fabian.paus@kit.edu>
Date: Mon, 6 May 2019 08:21:37 +0200
Subject: [PATCH] Remove branches in CMakeLists for qhull
---
CMakeLists.txt | 4 ----
GraspPlanning/CMakeLists.txt | 8 +-------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00b0ad24c..592720cee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,6 @@ add_compile_options(-Werror)
OPTION (Simox_USE_RBDL "Use RBDL" OFF)
OPTION (Simox_USE_URDF "Use URDF" OFF)
OPTION (Simox_USE_NLOPT "Use NLOPT" ON)
-OPTION(BUILD_qhull "if on builds qhull external library" OFF)
OPTION(SimDynamics_USE_BULLET "Use Bullet Physics Engine" ON)
OPTION(Simox_USE_COIN_VISUALIZATION "Use Coin3D for visualization" ON)
OPTION(Simox_USE_OPENSCENEGRAPH_VISUALIZATION "Use OpenSceneGraph for visualization" OFF)
@@ -159,9 +158,6 @@ endif()
if (Simox_BUILD_GraspStudio)
add_subdirectory(GraspPlanning)
list(APPEND SIMOX_EXPORT_TARGET_LIST GraspStudio)
- if (BUILD_qhull)
- list(APPEND SIMOX_EXPORT_TARGET_LIST simox-qhull)
- endif()
list (APPEND Simox_LIBRARIES GraspStudio)
endif()
diff --git a/GraspPlanning/CMakeLists.txt b/GraspPlanning/CMakeLists.txt
index da29449b2..f6e71831b 100644
--- a/GraspPlanning/CMakeLists.txt
+++ b/GraspPlanning/CMakeLists.txt
@@ -16,9 +16,7 @@ MACRO(ADD_GRASPSTUDIO_TEST TEST_NAME)
ENDMACRO(ADD_GRASPSTUDIO_TEST)
-########### QHULL #################
find_package(QHULL REQUIRED)
-########### END QHULL #################
SET(SOURCES
@@ -76,11 +74,7 @@ endif ()
ADD_LIBRARY (GraspStudio SHARED ${SOURCES} ${INCLUDES})
-IF(BUILD_qhull)
- target_include_directories(GraspStudio PUBLIC "ExternalDependencies/qhull-2003.1/include/")
-else()
- target_include_directories(GraspStudio PUBLIC ${QHULL_INCLUDE_DIRS})
-endif()
+target_include_directories(GraspStudio PUBLIC ${QHULL_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES (GraspStudio PUBLIC Saba VirtualRobot ${QHULL_LIBRARIES})
--
GitLab