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

Remove last vestiges of the KICAD_USE_OCE build flag 

This build flag was removed in a previous commit, but some last uses
remained.
This commit is contained in:
Ian McInerney 2021-12-01 15:53:00 +00:00
parent 9f568d3658
commit e57bde6582
9 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab/Fedora-Linux-CI.yml
View File

@ -28,7 +28,6 @@ fedora_build_linux:
-DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SCRIPTING_WXPYTHON=ON
-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON
-DKICAD_SCRIPTING_ACTION_MENU=ON -DKICAD_SCRIPTING_ACTION_MENU=ON
-DKICAD_USE_OCE=OFF
-DKICAD_USE_OCC=ON -DKICAD_USE_OCC=ON
-DKICAD_SPICE=ON -DKICAD_SPICE=ON
-DKICAD_BUILD_I18N=ON -DKICAD_BUILD_I18N=ON

1
.gitlab/Ubuntu-20.04-CI.yml
View File

@ -36,7 +36,6 @@ ubuntu20.04_build:
-DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SCRIPTING_WXPYTHON=ON
-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON
-DKICAD_SCRIPTING_ACTION_MENU=ON -DKICAD_SCRIPTING_ACTION_MENU=ON
-DKICAD_USE_OCE=OFF
-DKICAD_USE_OCC=ON -DKICAD_USE_OCC=ON
-DKICAD_SPICE=ON -DKICAD_SPICE=ON
-DKICAD_BUILD_I18N=ON -DKICAD_BUILD_I18N=ON

1
.gitlab/Windows-CI.yml
View File

@ -24,7 +24,6 @@ win64_build:
-DKICAD_SCRIPTING_WXPYTHON=OFF ` -DKICAD_SCRIPTING_WXPYTHON=OFF `
-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF ` -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF `
-DKICAD_SCRIPTING_ACTION_MENU=OFF ` -DKICAD_SCRIPTING_ACTION_MENU=OFF `
-DKICAD_USE_OCE=OFF `
-DKICAD_USE_OCC=ON ` -DKICAD_USE_OCC=ON `
-DKICAD_SPICE=ON ` -DKICAD_SPICE=ON `
-DKICAD_BUILD_PNS_DEBUG_TOOL=ON ` -DKICAD_BUILD_PNS_DEBUG_TOOL=ON `

1
.gitlab/coverity.yml
View File

@ -65,7 +65,6 @@ Coverity:
-DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SCRIPTING_WXPYTHON=ON
-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON
-DKICAD_SCRIPTING_ACTION_MENU=ON -DKICAD_SCRIPTING_ACTION_MENU=ON
-DKICAD_USE_OCE=OFF
-DKICAD_USE_OCC=ON -DKICAD_USE_OCC=ON
-DKICAD_SPICE=ON -DKICAD_SPICE=ON
- coverity/bin/cov-build --dir cov-int make -j8 - coverity/bin/cov-build --dir cov-int make -j8

1
.gitlab/linux-metadata-validate.yml
View File

@ -36,7 +36,6 @@ validate_linux_metadata:
-DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SCRIPTING_WXPYTHON=ON
-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON
-DKICAD_SCRIPTING_ACTION_MENU=ON -DKICAD_SCRIPTING_ACTION_MENU=ON
-DKICAD_USE_OCE=OFF
-DKICAD_USE_OCC=ON -DKICAD_USE_OCC=ON
-DKICAD_SPICE=ON -DKICAD_SPICE=ON
-DKICAD_BUILD_I18N=ON -DKICAD_BUILD_I18N=ON

25
CMakeSettings.json.sample
View File

@ -36,11 +36,6 @@
"value": "ON", "value": "ON",
"type": "STRING" "type": "STRING"
}, },
{
"name": "KICAD_USE_OCE",
"value": "OFF",
"type": "STRING"
},
{ {
"name": "KICAD_USE_OCC", "name": "KICAD_USE_OCC",
"value": "ON", "value": "ON",
@ -75,11 +70,6 @@
"value": "ON", "value": "ON",
"type": "STRING" "type": "STRING"
}, },
{
"name": "KICAD_USE_OCE",
"value": "OFF",
"type": "STRING"
},
{ {
"name": "KICAD_USE_OCC", "name": "KICAD_USE_OCC",
"value": "ON", "value": "ON",
@ -114,11 +104,6 @@
"value": "ON", "value": "ON",
"type": "STRING" "type": "STRING"
}, },
{
"name": "KICAD_USE_OCE",
"value": "OFF",
"type": "STRING"
},
{ {
"name": "KICAD_USE_OCC", "name": "KICAD_USE_OCC",
"value": "ON", "value": "ON",
@ -153,11 +138,6 @@
"value": "ON", "value": "ON",
"type": "STRING" "type": "STRING"
}, },
{
"name": "KICAD_USE_OCE",
"value": "OFF",
"type": "STRING"
},
{ {
"name": "KICAD_USE_OCC", "name": "KICAD_USE_OCC",
"value": "ON", "value": "ON",
@ -202,11 +182,6 @@
"value": "ON", "value": "ON",
"type": "STRING" "type": "STRING"
}, },
{
"name": "KICAD_USE_OCE",
"value": "ON",
"type": "STRING"
},
{ {
"name": "KICAD_USE_OCC", "name": "KICAD_USE_OCC",
"value": "OFF", "value": "OFF",

10
common/build_version.cpp
View File

@ -36,7 +36,7 @@
extern std::string GetKicadCurlVersion(); extern std::string GetKicadCurlVersion();
extern std::string GetCurlLibVersion(); extern std::string GetCurlLibVersion();
#if defined( KICAD_USE_OCC ) | defined( KICAD_USE_OCE ) #if defined( KICAD_USE_OCC )
#include <Standard_Version.hxx> #include <Standard_Version.hxx>
#endif #endif
@ -179,10 +179,6 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
aMsg << indent4 << "OCC: " << OCC_VERSION_COMPLETE << eol; aMsg << indent4 << "OCC: " << OCC_VERSION_COMPLETE << eol;
#endif #endif
#ifdef KICAD_USE_OCE
aMsg << indent4 << "OCE: " << OCC_VERSION_COMPLETE << eol;
#endif
aMsg << indent4 << "Curl: " << GetCurlLibVersion() << eol; aMsg << indent4 << "Curl: " << GetCurlLibVersion() << eol;
#if defined( KICAD_SPICE ) #if defined( KICAD_SPICE )
@ -223,10 +219,6 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
// Add build settings config (build options): // Add build settings config (build options):
aMsg << "Build settings:" << eol; aMsg << "Build settings:" << eol;
#ifdef KICAD_USE_OCE
aMsg << indent4 << "KICAD_USE_OCE=" << ON;
#endif
#ifdef KICAD_USE_OCC #ifdef KICAD_USE_OCC
aMsg << indent4 << "KICAD_USE_OCC=" << ON; aMsg << indent4 << "KICAD_USE_OCC=" << ON;
#endif #endif

4
plugins/3d/CMakeLists.txt
View File

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

4
utils/CMakeLists.txt
View File

@ -6,6 +6,6 @@ endif()
add_subdirectory( idftools ) add_subdirectory( idftools )
if( KICAD_USE_OCE OR KICAD_USE_OCC ) if( KICAD_USE_OCC )
add_subdirectory( kicad2step ) add_subdirectory( kicad2step )
endif( KICAD_USE_OCE OR KICAD_USE_OCC ) endif( KICAD_USE_OCC )