Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-09 09:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake - use find_package for occ if variables are not provided

Browse Source 
cmake configs seems to be provided with the default installation, so `find_package` should do the job that `find_path` and `find_library` did previously.
This commit is contained in:
Andrej730
2025-09-18 10:33:33 +05:00
parent 663d233e3c
commit 1857d06245
1 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/CMakeLists.txt
+10 -32
View File
@@ -429,37 +429,12 @@ if(BUILD_IFCGEOM)
# Open CASCADE # Open CASCADE
if(WITH_OPENCASCADE) if(WITH_OPENCASCADE)
if(OCC_INCLUDE_DIR)
# Fallback for missing OCC_INCLUDE_DIR.
if(NOT OCC_INCLUDE_DIR)
clear_wasm_sysroot()
find_path(OCC_INCLUDE_DIR Standard_Version.hxx
PATHS
/usr/include/occt
/usr/include/oce
/usr/include/opencascade
)
restore_wasm_sysroot()
if(OCC_INCLUDE_DIR)
message(STATUS "Found Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
endif()
else()
set(OCC_INCLUDE_DIR ${OCC_INCLUDE_DIR} CACHE FILEPATH "Open CASCADE header files") 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}") message(STATUS "Looking for Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
endif() endif()
if("${OCC_LIBRARY_DIR}" STREQUAL "") if(OCC_LIBRARY_DIR)
find_library(OCC_LIBRARY TKernel
PATHS
/usr/lib
)
if(OCC_LIBRARY)
GET_FILENAME_COMPONENT(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
message(STATUS "Found Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
endif()
else()
set(OCC_LIBRARY_DIR ${OCC_LIBRARY_DIR} CACHE FILEPATH "Open CASCADE library files") set(OCC_LIBRARY_DIR ${OCC_LIBRARY_DIR} CACHE FILEPATH "Open CASCADE library files")
message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}") message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
endif() endif()
@@ -468,14 +443,15 @@ if(BUILD_IFCGEOM)
if(OCC_INCLUDE_DIR AND OCC_LIBRARY_DIR) if(OCC_INCLUDE_DIR AND OCC_LIBRARY_DIR)
message( message(
STATUS STATUS
"Using provided OCCT_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') " "Using provided OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') "
"and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}')." "and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}')."
) )
elseif(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR) elseif(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR)
# OCE is not supported for find_package, because it's using a different name (`oce`)
# and also has an odd directory structure (install/lib/oce-0.18/*.cmake).
find_package(OpenCASCADE CONFIG REQUIRED) find_package(OpenCASCADE CONFIG REQUIRED)
get_target_property(OCC_INCLUDE_DIR TKernel INTERFACE_INCLUDE_DIRECTORIES) set(OCC_INCLUDE_DIR ${OpenCASCADE_INCLUDE_DIR})
get_target_property(TKERNEL_LIB_PATH TKernel LOCATION) set(OCC_LIBRARY_DIR ${OpenCASCADE_LIBRARY_DIR})
get_filename_component(OCC_LIBRARY_DIR "${TKERNEL_LIB_PATH}" DIRECTORY)
message( message(
STATUS STATUS
"Found Open CASCADE package at '${OpenCASCADE_DIR}', " "Found Open CASCADE package at '${OpenCASCADE_DIR}', "
@@ -487,7 +463,9 @@ if(BUILD_IFCGEOM)
FATAL_ERROR FATAL_ERROR
"Couldn't find Open CASCADE installation. " "Couldn't find Open CASCADE installation. "
"Either both OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}') " "Either both OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}') "
"must be specified or OpenCASCADE package should be discoverable." "must be specified or OpenCASCADE package should be discoverable. "
"If you're using OCE, then providing a package is not available "
"and you need to provide OCE_INCLUDE_DIR and OCE_LIBRARY_DIR directly."
) )
endif() endif()