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

Add KICAD_ prefix to build switches 

KICAD_ prefix was added to the USE_OCE and USE_SCH_IO_MANAGER build
switches together with a small description to the devdocs from
compiling.md.
This commit is contained in:
Nick Østergaard 2016-09-03 13:17:58 +02:00 committed by Wayne Stambaugh
parent b63f2f81b7
commit caafcde585
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -41,11 +41,11 @@ option( KICAD_SCRIPTING_WXPYTHON
"Build wxPython implementation for wx interface building in Python and py.shell (default OFF)." "Build wxPython implementation for wx interface building in Python and py.shell (default OFF)."
) )
option( USE_SCH_IO_MANAGER option( KICAD_USE_SCH_IO_MANAGER
"Build Eeschema with the I/O manager for handling schematic and symbol library I/O. (default OFF)" "Build Eeschema with the I/O manager for handling schematic and symbol library I/O. (default OFF)"
) )
option( USE_OCE option( KICAD_USE_OCE
"Build tools and plugins related to OpenCascade Community Edition (default OFF)" "Build tools and plugins related to OpenCascade Community Edition (default OFF)"
) )
@ -520,7 +520,7 @@ if( KICAD_SPICE )
endif() endif()
# Find OpenCascade Community Edition, required for STEP plugin and tools # Find OpenCascade Community Edition, required for STEP plugin and tools
if( USE_OCE ) if( KICAD_USE_OCE )
set( LIBS_OCE TKBinXCAF TKPCAF TKSTEP TKXDESTEP TKIGES TKXDEIGES ) set( LIBS_OCE TKBinXCAF TKPCAF TKSTEP TKXDESTEP TKIGES TKXDEIGES )
find_package( OCE 0.16 REQUIRED ${LIBS_OCE} ) find_package( OCE 0.16 REQUIRED ${LIBS_OCE} )

14
Documentation/development/compiling.md
View File

@ -154,11 +154,17 @@ The KICAD_SPICE option is used to control if the Spice simulator interface for e
this option is enabled, it requires [ngspice][] to be available as a shared library. This option is this option is enabled, it requires [ngspice][] to be available as a shared library. This option is
disabled by default. disabled by default.
## STEP and IGES model support ## {#oce_opt} ## New schmatic file format ## {#sch_io_mgr_opt}
The KICAD_USE_OCE option is used to enable STEP and IGES model support for the 3d viewer. When enabled The KICAD_USE_SCH_IO_MANAGER option is used to control if the new Eeschema I/O manager for handling
this requires the location of the installed OCE libary to be passed via the OCE_DIR flag. This option is schematic and symbol library I/O is enabled. This option is disabled by default.
disabled by default.
## STEP/IGES support for the 3D viewer ## {#oce_opt}
The KICAD_USE_OCE is used for the 3D viewer plugin to support STEP and IGES 3D models. Build tools
and plugins related to OpenCascade Community Edition (OCE) are enabled with this option. When
enabled it requires [OCE][] to be available, and the location of the installed OCE libary to be
passed via the OCE_DIR flag. This option is disabled by default.
# Getting the KiCad Source Code ## {#getting_src} # Getting the KiCad Source Code ## {#getting_src}

2
eeschema/class_library.cpp
View File

@ -715,7 +715,7 @@ PART_LIB* PART_LIB::LoadLibrary( const wxString& aFileName ) throw( IO_ERROR, bo
wxString errorMsg; wxString errorMsg;
#ifdef USE_SCH_IO_MANAGER #ifdef KICAD_USE_SCH_IO_MANAGER
SCH_PLUGIN::SCH_PLUGIN_RELEASER pi( SCH_IO_MGR::FindPlugin( SCH_IO_MGR::SCH_LEGACY ) ); SCH_PLUGIN::SCH_PLUGIN_RELEASER pi( SCH_IO_MGR::FindPlugin( SCH_IO_MGR::SCH_LEGACY ) );
wxArrayString tmp; wxArrayString tmp;

4
eeschema/files-io.cpp
View File

@ -110,7 +110,7 @@ bool SCH_EDIT_FRAME::SaveEEFile( SCH_SCREEN* aScreen, bool aSaveUnderNewName,
wxLogTrace( traceAutoSave, wxLogTrace( traceAutoSave,
wxT( "Saving file <" ) + schematicFileName.GetFullPath() + wxT( ">" ) ); wxT( "Saving file <" ) + schematicFileName.GetFullPath() + wxT( ">" ) );
#ifdef USE_SCH_IO_MANAGER #ifdef KICAD_USE_SCH_IO_MANAGER
SCH_PLUGIN::SCH_PLUGIN_RELEASER pi( SCH_IO_MGR::FindPlugin( SCH_IO_MGR::SCH_LEGACY ) ); SCH_PLUGIN::SCH_PLUGIN_RELEASER pi( SCH_IO_MGR::FindPlugin( SCH_IO_MGR::SCH_LEGACY ) );
try try
@ -315,7 +315,7 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
} }
else else
{ {
#ifdef USE_SCH_IO_MANAGER #ifdef KICAD_USE_SCH_IO_MANAGER
delete g_RootSheet; // Delete the current project. delete g_RootSheet; // Delete the current project.
g_RootSheet = NULL; // Force CreateScreens() to build new empty project on load failure. g_RootSheet = NULL; // Force CreateScreens() to build new empty project on load failure.

4
plugins/3d/CMakeLists.txt
View File

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