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

Remove last vestiges of WX_GRAPHICS_CONTEXT

This commit is contained in:
Seth Hillbrand 2019-06-18 05:14:13 -07:00
parent aba58e3e48
commit ffc1b6406f
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -60,9 +60,6 @@ option( BUILD_SMALL_DEBUG_FILES "In debug build: create smaller binaries." OFF )
# so that build option settings can be included in bug reports. # so that build option settings can be included in bug reports.
# #
option( USE_WX_GRAPHICS_CONTEXT
"Use wxGraphicsContext for rendering (default OFF). Warning, this is experimental" )
option( KICAD_SCRIPTING option( KICAD_SCRIPTING
"Build the Python scripting support inside KiCad binaries (default ON)." "Build the Python scripting support inside KiCad binaries (default ON)."
ON ) ON )
@ -391,10 +388,6 @@ if( KICAD_USE_CUSTOM_PADS )
add_definitions( -DKICAD_USE_CUSTOM_PADS ) add_definitions( -DKICAD_USE_CUSTOM_PADS )
endif() endif()
if( USE_WX_GRAPHICS_CONTEXT OR APPLE )
add_definitions( -DUSE_WX_GRAPHICS_CONTEXT )
endif()
# KIFACE_SUFFIX is the file extension used for top level program modules which # KIFACE_SUFFIX is the file extension used for top level program modules which
# implement the KIFACE interface. A valid suffix starts with a period '.'. # implement the KIFACE interface. A valid suffix starts with a period '.'.
@ -583,17 +576,10 @@ find_package( Boost 1.54.0 REQUIRED )
# Include MinGW resource compiler. # Include MinGW resource compiler.
include( MinGWResourceCompiler ) include( MinGWResourceCompiler )
# Find GDI+ on windows if wxGraphicsContext is available, and only link gdiplus library
# if wxGraphicsContext not used, because the cairo printing system uses this library
if( WIN32 ) if( WIN32 )
if( USE_WX_GRAPHICS_CONTEXT ) # we need the gdiplus library for cairo printing on windows
find_package( GdiPlus )
check_find_package_result( GDI_PLUS_FOUND "GDI+" )
else()
# if WX_GRAPHICS_CONTEXT is not used we just need the gdiplus library for cairo printing
set( GDI_PLUS_LIBRARIES gdiplus ) set( GDI_PLUS_LIBRARIES gdiplus )
endif() endif()
endif()
# Find ngspice library, required for integrated circuit simulator # Find ngspice library, required for integrated circuit simulator
if( KICAD_SPICE ) if( KICAD_SPICE )