From e4640df6f0c527a113601649354d54422df109b4 Mon Sep 17 00:00:00 2001 From: Priit Laes Date: Sat, 6 Mar 2021 14:23:24 +0200 Subject: [PATCH] build: cmake: Rework OpenCascade header directory lookup --- cmake/CMakeLists.txt | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 989408fc60..c97f8d54d1 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -227,21 +227,24 @@ IF(MSVC) add_debug_variants(LIBXML2_LIBRARIES "${LIBXML2_LIBRARIES}" d) ENDIF() -# Find Open CASCADE +# Open CASCADE headers IF("${OCC_INCLUDE_DIR}" STREQUAL "") - SET(OCC_INCLUDE_DIR "/usr/include/oce/" CACHE FILEPATH "Open CASCADE header files") - MESSAGE(STATUS "Looking for Open CASCADE include files in: ${OCC_INCLUDE_DIR}") - MESSAGE(STATUS "Use OCC_INCLUDE_DIR to specify another directory") + FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx + [PATHS + /usr/include/occt + /usr/include/oce + /usr/include/opencascade + ] + REQUIRED + ) + IF(OCC_INCLUDE_DIR) + MESSAGE(STATUS "Found Open CASCADE include files in: ${OCC_INCLUDE_DIR}") + ELSE() + MESSAGE(FATAL_ERROR "Unable to find Open CASCADE include directory, specify OCC_INCLUDE_DIR manually.") + ENDIF() ELSE() - SET(OCC_INCLUDE_DIR ${OCC_INCLUDE_DIR} CACHE FILEPATH "Open CASCADE header files") - MESSAGE(STATUS "Looking for Open CASCADE include files in: ${OCC_INCLUDE_DIR}") -ENDIF() - -FIND_FILE(gp_Pnt_hxx "gp_Pnt.hxx" ${OCC_INCLUDE_DIR}) -IF(gp_Pnt_hxx) - MESSAGE(STATUS "Header files found") -ELSE() - MESSAGE(FATAL_ERROR "Unable to find header files, aborting") + SET(OCC_INCLUDE_DIR ${OCC_INCLUDE_DIR} CACHE FILEPATH "Open CASCADE header files") + MESSAGE(STATUS "Looking for Open CASCADE include files in: ${OCC_INCLUDE_DIR}") ENDIF() SET(OPENCASCADE_LIBRARY_NAMES