diff --git a/.gitlab/Fedora-Linux-CI.yml b/.gitlab/Fedora-Linux-CI.yml index 28e6ccadfa..5239fa4b0d 100644 --- a/.gitlab/Fedora-Linux-CI.yml +++ b/.gitlab/Fedora-Linux-CI.yml @@ -28,7 +28,6 @@ fedora_build_linux: -DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON -DKICAD_SCRIPTING_ACTION_MENU=ON - -DKICAD_USE_OCE=OFF -DKICAD_USE_OCC=ON -DKICAD_SPICE=ON -DKICAD_BUILD_I18N=ON diff --git a/.gitlab/Ubuntu-20.04-CI.yml b/.gitlab/Ubuntu-20.04-CI.yml index c53d3c8c4c..2b2a59707f 100644 --- a/.gitlab/Ubuntu-20.04-CI.yml +++ b/.gitlab/Ubuntu-20.04-CI.yml @@ -36,7 +36,6 @@ ubuntu20.04_build: -DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON -DKICAD_SCRIPTING_ACTION_MENU=ON - -DKICAD_USE_OCE=OFF -DKICAD_USE_OCC=ON -DKICAD_SPICE=ON -DKICAD_BUILD_I18N=ON diff --git a/.gitlab/Windows-CI.yml b/.gitlab/Windows-CI.yml index fe626c51a1..0330cf3edf 100644 --- a/.gitlab/Windows-CI.yml +++ b/.gitlab/Windows-CI.yml @@ -24,7 +24,6 @@ win64_build: -DKICAD_SCRIPTING_WXPYTHON=OFF ` -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF ` -DKICAD_SCRIPTING_ACTION_MENU=OFF ` - -DKICAD_USE_OCE=OFF ` -DKICAD_USE_OCC=ON ` -DKICAD_SPICE=ON ` -DKICAD_BUILD_PNS_DEBUG_TOOL=ON ` diff --git a/.gitlab/coverity.yml b/.gitlab/coverity.yml index e3259874d5..711b738bab 100644 --- a/.gitlab/coverity.yml +++ b/.gitlab/coverity.yml @@ -65,7 +65,6 @@ Coverity: -DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON -DKICAD_SCRIPTING_ACTION_MENU=ON - -DKICAD_USE_OCE=OFF -DKICAD_USE_OCC=ON -DKICAD_SPICE=ON - coverity/bin/cov-build --dir cov-int make -j8 diff --git a/.gitlab/linux-metadata-validate.yml b/.gitlab/linux-metadata-validate.yml index 566184c99b..f90a05928e 100644 --- a/.gitlab/linux-metadata-validate.yml +++ b/.gitlab/linux-metadata-validate.yml @@ -36,7 +36,6 @@ validate_linux_metadata: -DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON -DKICAD_SCRIPTING_ACTION_MENU=ON - -DKICAD_USE_OCE=OFF -DKICAD_USE_OCC=ON -DKICAD_SPICE=ON -DKICAD_BUILD_I18N=ON diff --git a/CMakeSettings.json.sample b/CMakeSettings.json.sample index 1816b79105..be5dc19e96 100644 --- a/CMakeSettings.json.sample +++ b/CMakeSettings.json.sample @@ -36,11 +36,6 @@ "value": "ON", "type": "STRING" }, - { - "name": "KICAD_USE_OCE", - "value": "OFF", - "type": "STRING" - }, { "name": "KICAD_USE_OCC", "value": "ON", @@ -75,11 +70,6 @@ "value": "ON", "type": "STRING" }, - { - "name": "KICAD_USE_OCE", - "value": "OFF", - "type": "STRING" - }, { "name": "KICAD_USE_OCC", "value": "ON", @@ -114,11 +104,6 @@ "value": "ON", "type": "STRING" }, - { - "name": "KICAD_USE_OCE", - "value": "OFF", - "type": "STRING" - }, { "name": "KICAD_USE_OCC", "value": "ON", @@ -153,11 +138,6 @@ "value": "ON", "type": "STRING" }, - { - "name": "KICAD_USE_OCE", - "value": "OFF", - "type": "STRING" - }, { "name": "KICAD_USE_OCC", "value": "ON", @@ -202,11 +182,6 @@ "value": "ON", "type": "STRING" }, - { - "name": "KICAD_USE_OCE", - "value": "ON", - "type": "STRING" - }, { "name": "KICAD_USE_OCC", "value": "OFF", diff --git a/common/build_version.cpp b/common/build_version.cpp index 5268d2e117..ff3c87e68c 100644 --- a/common/build_version.cpp +++ b/common/build_version.cpp @@ -36,7 +36,7 @@ extern std::string GetKicadCurlVersion(); extern std::string GetCurlLibVersion(); -#if defined( KICAD_USE_OCC ) | defined( KICAD_USE_OCE ) +#if defined( KICAD_USE_OCC ) #include <Standard_Version.hxx> #endif @@ -179,10 +179,6 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief ) aMsg << indent4 << "OCC: " << OCC_VERSION_COMPLETE << eol; #endif -#ifdef KICAD_USE_OCE - aMsg << indent4 << "OCE: " << OCC_VERSION_COMPLETE << eol; -#endif - aMsg << indent4 << "Curl: " << GetCurlLibVersion() << eol; #if defined( KICAD_SPICE ) @@ -223,10 +219,6 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief ) // Add build settings config (build options): aMsg << "Build settings:" << eol; -#ifdef KICAD_USE_OCE - aMsg << indent4 << "KICAD_USE_OCE=" << ON; -#endif - #ifdef KICAD_USE_OCC aMsg << indent4 << "KICAD_USE_OCC=" << ON; #endif diff --git a/plugins/3d/CMakeLists.txt b/plugins/3d/CMakeLists.txt index f46f48cf20..daa8433d2b 100644 --- a/plugins/3d/CMakeLists.txt +++ b/plugins/3d/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory( idf ) add_subdirectory( vrml ) -if( KICAD_USE_OCE OR KICAD_USE_OCC ) +if( KICAD_USE_OCC ) add_subdirectory( oce ) -endif( KICAD_USE_OCE OR KICAD_USE_OCC ) +endif( KICAD_USE_OCC ) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 451a5117d8..8c7af70faa 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -6,6 +6,6 @@ endif() add_subdirectory( idftools ) -if( KICAD_USE_OCE OR KICAD_USE_OCC ) +if( KICAD_USE_OCC ) add_subdirectory( kicad2step ) -endif( KICAD_USE_OCE OR KICAD_USE_OCC ) +endif( KICAD_USE_OCC )