From 672e98bd89909e5baa865c40d7f8f812fed90c82 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Thu, 1 Nov 2018 06:12:34 -0700 Subject: [PATCH] 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 --- CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6af21244fe..9c8196a7dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -807,8 +807,12 @@ if( KICAD_SCRIPTING_WXPYTHON ) set( wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} "--toolkit=${WXPYTHON_TOOLKIT}" ) endif() - # Require wxWidgets 3.0.0 as the minimum when wxPython is disabled - set( wxWidgets_REQ_VERSION ${WXPYTHON_WXVERSION} ) + if( KICAD_SCRIPTING_WXPYTHON_PHOENIX ) + 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() # Require wxWidgets 3.0.0 as the minimum when wxPython is disabled 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} ) -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. foreach( path ${wxWidgets_INCLUDE_DIRS} ) #message( STATUS "Searching for wx/wxPython/wxPython.h in ${path}" )