diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fb7c7dc..3c411845 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -375,28 +375,34 @@ if (USE_OCC) TKGeomAlgo TKGeomBase TKHLR - TKIGES TKLCAF TKMath TKMesh TKOffset TKPrim - TKSTEP - TKSTEP209 - TKSTEPAttr - TKSTEPBase - TKSTL TKService TKShHealing TKTopAlgo TKV3d TKVCAF TKXCAF - TKXDEIGES - TKXDESTEP TKXSBase TKernel ) + if(${OpenCASCADE_MAJOR_VERSION}.${OpenCASCADE_MINOR_VERSION} VERSION_GREATER_EQUAL 7.8) + list(APPEND OCC_LIBRARIES TKDEIGES TKDESTEP TKDESTL) + else() + list(APPEND OCC_LIBRARIES + TKIGES + TKSTEP + TKSTL + TKXDEIGES + TKXDESTEP + TKSTEP209 + TKSTEPAttr + TKSTEPBase + ) + endif() if(UNIX AND NOT APPLE) list(PREPEND OCC_LIBRARIES -Wl,--start-group) list(APPEND OCC_LIBRARIES -Wl,--end-group) diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake index 58406f0b..70964022 100644 --- a/cmake/SuperBuild.cmake +++ b/cmake/SuperBuild.cmake @@ -89,8 +89,10 @@ if(BUILD_OCC) set(OCC_DIR ${CMAKE_CURRENT_BINARY_DIR}/dependencies/occ) ExternalProject_Add(project_occ - URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_3.zip - URL_MD5 2426e373903faabbd4f96a01a934b66d + # URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_3.zip + # URL_MD5 2426e373903faabbd4f96a01a934b66d + URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_8_0.zip + URL_MD5 19d025bf6b4f6ba1b334d189529573cb DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies ${SUBPROJECT_ARGS} CMAKE_ARGS diff --git a/libsrc/occ/Partition_Loop3d.hxx b/libsrc/occ/Partition_Loop3d.hxx index e1716691..138b07e1 100644 --- a/libsrc/occ/Partition_Loop3d.hxx +++ b/libsrc/occ/Partition_Loop3d.hxx @@ -29,7 +29,6 @@ #if OCC_VERSION_HEX < 0x070000 #else #include - #include #include #endif