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

Remove KICAD_OCC build option 

We don't really support builds without OCC these days.  Removing to
clear up build flags and settings
This commit is contained in:
Seth Hillbrand 2022-08-18 13:11:37 -07:00
parent f4fa3b02c5
commit 5ed7e28252
6 changed files with 15 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
CMakeLists.txt
View File

@ -62,10 +62,6 @@ option( KICAD_SCRIPTING_WXPYTHON
ON )
mark_as_advanced( KICAD_SCRIPTING_WXPYTHON )
option( KICAD_USE_OCC
"Build tools and plugins related to OpenCascade Technology (default ON)"
ON )
option( KICAD_INSTALL_DEMOS
"Install KiCad demos and examples (default ON)"
ON )
@ -516,10 +512,6 @@ if( KICAD_SPICE )
add_definitions( -DKICAD_SPICE )
endif()
if( KICAD_USE_OCC )
add_definitions( -DKICAD_USE_OCC )
endif()
if( KICAD_SIGNAL_INTEGRITY )
add_definitions( -DKICAD_SIGNAL_INTEGRITY )
endif()
@ -797,21 +789,19 @@ if( KICAD_SPICE )
endif()
# Find OpenCascade, required for STEP plugin and tools
if( KICAD_USE_OCC )
find_package(OCC)
if( NOT OCC_FOUND )
MESSAGE( FATAL_ERROR "================================================================\n"
" KICAD_USE_OCC=True but OpenCASCADE was not found!\n"
"================================================================\n")
endif()
if( OCC_VERSION_STRING VERSION_LESS 7.3.0 )
MESSAGE( FATAL_ERROR "================================================================\n"
"OpenCASCADE version ${OCC_VERSION_STRING} was found.\n"
" KiCad requires a minimum version of 7.3.0\n"
"================================================================\n")
endif()
include_directories( SYSTEM ${OCC_INCLUDE_DIR} )
find_package(OCC)
if( NOT OCC_FOUND )
MESSAGE( FATAL_ERROR "================================================================\n"
" OpenCASCADE was not found!\n"
"================================================================\n")
endif()
if( OCC_VERSION_STRING VERSION_LESS 7.3.0 )
MESSAGE( FATAL_ERROR "================================================================\n"
"OpenCASCADE version ${OCC_VERSION_STRING} was found.\n"
" KiCad requires a minimum version of 7.3.0\n"
"================================================================\n")
endif()
include_directories( SYSTEM ${OCC_INCLUDE_DIR} )
# Assist with header file searching optimization:
# INC_BEFORE and INC_AFTER are two lists which go at the front and back of the

25
CMakeSettings.json.sample
View File

@ -36,11 +36,6 @@
"value": "ON",
"type": "STRING"
},
{
"name": "KICAD_USE_OCC",
"value": "ON",
"type": "BOOL"
},
{
"name": "KICAD_BUILD_QA_TESTS",
"value": "False",
@ -70,11 +65,6 @@
"value": "ON",
"type": "STRING"
},
{
"name": "KICAD_USE_OCC",
"value": "ON",
"type": "BOOL"
},
{
"name": "KICAD_BUILD_QA_TESTS",
"value": "False",
@ -104,11 +94,6 @@
"value": "ON",
"type": "STRING"
},
{
"name": "KICAD_USE_OCC",
"value": "ON",
"type": "BOOL"
},
{
"name": "KICAD_BUILD_QA_TESTS",
"value": "False",
@ -138,11 +123,6 @@
"value": "ON",
"type": "STRING"
},
{
"name": "KICAD_USE_OCC",
"value": "ON",
"type": "BOOL"
},
{
"name": "KICAD_BUILD_QA_TESTS",
"value": "False",
@ -182,11 +162,6 @@
"value": "ON",
"type": "STRING"
},
{
"name": "KICAD_USE_OCC",
"value": "OFF",
"type": "BOOL"
},
{
"name": "KICAD_BUILD_QA_TESTS",
"value": "False",

9
common/build_version.cpp
View File

@ -37,9 +37,7 @@
extern std::string GetKicadCurlVersion();
extern std::string GetCurlLibVersion();
#if defined( KICAD_USE_OCC )
#include <Standard_Version.hxx>
#endif
#if defined( KICAD_SPICE )
#include <ngspice/sharedspice.h>
@ -184,10 +182,7 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
<< ( BOOST_VERSION / 100 % 1000 ) << wxT( "." )
<< ( BOOST_VERSION % 100 ) << eol;
#ifdef KICAD_USE_OCC
aMsg << indent4 << "OCC: " << OCC_VERSION_COMPLETE << eol;
#endif
aMsg << indent4 << "Curl: " << GetCurlLibVersion() << eol;
#if defined( KICAD_SPICE )
@ -228,10 +223,6 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
// Add build settings config (build options):
aMsg << "Build settings:" << eol;
#ifdef KICAD_USE_OCC
aMsg << indent4 << "KICAD_USE_OCC=" << ON;
#endif
#ifdef KICAD_USE_EGL
aMsg << indent4 << "KICAD_USE_EGL=" << ON;
#endif

4
kicad/CMakeLists.txt
View File

@ -128,9 +128,7 @@ if( APPLE )
set( BUNDLE_FIX_DIRS ${BUNDLE_FIX_DIRS} ${MACOS_EXTRA_BUNDLE_FIX_DIRS} ) # TODO: where should we document MACOS_EXTRA_BUNDLE_FIX_DIRS?
endif()
if( KICAD_USE_OCC )
set( BUNDLE_FIX_DIRS ${BUNDLE_FIX_DIRS} ${OCC_LIBRARY_DIR} )
endif()
set( BUNDLE_FIX_DIRS ${BUNDLE_FIX_DIRS} ${OCC_LIBRARY_DIR} )
# make main bundle relocatable
install( CODE "

5
plugins/3d/CMakeLists.txt
View File

@ -1,6 +1,3 @@
add_subdirectory( idf )
add_subdirectory( vrml )
if( KICAD_USE_OCC )
add_subdirectory( oce )
endif( KICAD_USE_OCC )
add_subdirectory( oce )

5
utils/CMakeLists.txt
View File

@ -5,7 +5,4 @@ if( COMPILER_SUPPORTS_WARNINGS )
endif()
add_subdirectory( idftools )
if( KICAD_USE_OCC )
add_subdirectory( kicad2step )
endif( KICAD_USE_OCC )
add_subdirectory( kicad2step )