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

Phoenix: Fix wxwidget version 

Phoenix reports version 4.x but wxWidgets do not follow this version.
Phoenix also does not have or require the wxPython.h file.

Fixes: lp:1801109
* https://bugs.launchpad.net/kicad/+bug/1801109
This commit is contained in:
Seth Hillbrand 2018-11-01 06:12:34 -07:00
parent ad99983672
commit 672e98bd89
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -807,8 +807,12 @@ if( KICAD_SCRIPTING_WXPYTHON )
set( wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} "--toolkit=${WXPYTHON_TOOLKIT}" ) set( wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} "--toolkit=${WXPYTHON_TOOLKIT}" )
endif() endif()
# Require wxWidgets 3.0.0 as the minimum when wxPython is disabled if( KICAD_SCRIPTING_WXPYTHON_PHOENIX )
set( wxWidgets_REQ_VERSION ${WXPYTHON_WXVERSION} ) set( wxWidgets_REQ_VERSION 3.0.2 )
else()
# Require wxWidgets 3.0.0 as the minimum when wxPython is disabled
set( wxWidgets_REQ_VERSION ${WXPYTHON_WXVERSION} )
endif()
else() else()
# Require wxWidgets 3.0.0 as the minimum when wxPython is disabled # Require wxWidgets 3.0.0 as the minimum when wxPython is disabled
set( wxWidgets_REQ_VERSION 3.0.0 ) set( wxWidgets_REQ_VERSION 3.0.0 )
@ -823,7 +827,7 @@ find_package( wxWidgets ${wxWidgets_REQ_VERSION} COMPONENTS gl aui adv html core
include( ${wxWidgets_USE_FILE} ) include( ${wxWidgets_USE_FILE} )
if( KICAD_SCRIPTING_WXPYTHON ) if( KICAD_SCRIPTING_WXPYTHON AND NOT KICAD_SCRIPTING_WXPYTHON_PHOENIX )
# wxPython appears to be installed and valid so make sure the headers are available. # wxPython appears to be installed and valid so make sure the headers are available.
foreach( path ${wxWidgets_INCLUDE_DIRS} ) foreach( path ${wxWidgets_INCLUDE_DIRS} )
#message( STATUS "Searching for wx/wxPython/wxPython.h in ${path}" ) #message( STATUS "Searching for wx/wxPython/wxPython.h in ${path}" )