haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump OpenCascade requirement to 7.3 

Removes support for abandonded OCE project.

Fixes https://gitlab.com/kicad/code/kicad/issues/9386
This commit is contained in:
Seth Hillbrand 2021-10-13 09:43:25 -07:00
parent 1b6c4638ca
commit 1c5c052301
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -59,12 +59,8 @@ option( KICAD_SCRIPTING_WXPYTHON
ON ) ON )
mark_as_advanced( KICAD_SCRIPTING_WXPYTHON ) mark_as_advanced( KICAD_SCRIPTING_WXPYTHON )
option( KICAD_USE_OCE
"Build tools and plugins related to OpenCascade Community Edition (default OFF)"
OFF )
option( KICAD_USE_OCC option( KICAD_USE_OCC
"Build tools and plugins related to OpenCascade Technology (overrides KICAD_USE_OCE, default ON)" "Build tools and plugins related to OpenCascade Technology (default ON)"
ON ) ON )
option( KICAD_INSTALL_DEMOS option( KICAD_INSTALL_DEMOS
@ -480,14 +476,8 @@ if( KICAD_SPICE )
add_definitions( -DKICAD_SPICE ) add_definitions( -DKICAD_SPICE )
endif() endif()
if( KICAD_USE_OCE )
add_definitions( -DKICAD_USE_OCE )
endif()
if( KICAD_USE_OCC ) if( KICAD_USE_OCC )
add_definitions( -DKICAD_USE_OCC ) add_definitions( -DKICAD_USE_OCC )
remove_definitions( -DKICAD_USE_OCE )
unset( KICAD_USE_OCE CACHE )
endif() endif()
if( KICAD_USE_EGL AND UNIX AND NOT APPLE ) if( KICAD_USE_EGL AND UNIX AND NOT APPLE )
@ -736,24 +726,18 @@ if( KICAD_SPICE )
find_package( ngspice REQUIRED ) find_package( ngspice REQUIRED )
endif() endif()
# Find OpenCascade Community Edition, required for STEP plugin and tools # Find OpenCascade, required for STEP plugin and tools
if( KICAD_USE_OCE ) if( KICAD_USE_OCC )
set( OCC_LIBRARIES TKBinXCAF TKPCAF TKSTEP TKXDESTEP TKIGES TKXDEIGES )
find_package( OCE 0.18 REQUIRED ${OCC_LIBRARIES} )
include_directories( SYSTEM ${OCE_INCLUDE_DIRS} )
elseif( KICAD_USE_OCC )
find_package(OpenCASCADE) find_package(OpenCASCADE)
if( NOT OCC_FOUND ) if( NOT OCC_FOUND )
MESSAGE( FATAL_ERROR "================================================================\n" MESSAGE( FATAL_ERROR "================================================================\n"
" KICAD_USE_OCC=True but OpenCASCADE was not found!\n" " KICAD_USE_OCC=True but OpenCASCADE was not found!\n"
"================================================================\n") "================================================================\n")
endif() endif()
if( OCC_VERSION_STRING VERSION_LESS 6.9.0 ) if( OCC_VERSION_STRING VERSION_LESS 7.3.0 )
MESSAGE( FATAL_ERROR "================================================================\n" MESSAGE( FATAL_ERROR "================================================================\n"
"OpenCASCADE version ${OCC_VERSION_STRING} was found.\n" "OpenCASCADE version ${OCC_VERSION_STRING} was found.\n"
" KiCad requires a minimum version of 6.9.0\n" " KiCad requires a minimum version of 7.3.0\n"
"================================================================\n") "================================================================\n")
endif() endif()
include_directories( SYSTEM ${OCC_INCLUDE_DIR} ) include_directories( SYSTEM ${OCC_INCLUDE_DIR} )