From 282fda85326e3f1d48893f0b02332b9e18cfaa5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= Date: Mon, 26 Dec 2022 20:36:55 +0100 Subject: [PATCH] remove OCE from CMake, it is unmaintained Haiku now also uses the official OpenCASCADE and this actually works now! --- src/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 51b8db0..5045cea 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -55,8 +55,7 @@ endif() set(CMAKE_PREFIX_PATH "${OPENCASCADE_PREFIX};${CMAKE_PREFIX_PATH}") -find_package(OpenCASCADE) -find_package(OCE) +find_package(OpenCASCADE REQUIRED) if(OpenCASCADE_WITH_TBB) set(TBB_LIBRARY_PREFIX "${OPENCASCADE_PREFIX}/tbb_2017.0.100/lib/intel64/vc14" CACHE PATH "TBB library directory") @@ -78,7 +77,7 @@ if(OpenCASCADE_WITH_FREETYPE) option(FREETYPE_SHARED "link FreeType as shared library" ON) endif() -include_directories(${OpenCASCADE_INCLUDE_DIR} ${OCE_INCLUDE_DIRS}) +include_directories(${OpenCASCADE_INCLUDE_DIR}) # OpenCASCADE-config.cmake doesn't define this option yet, so define it here instead option(OpenCASCADE_WITH_OPENVR "whether OpenCASCADE was built with OpenVR support" ON)