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

Fix builds with scripting disabled 

Fixes: lp:1750853
* https://bugs.launchpad.net/kicad/+bug/1750853
This commit is contained in:
Maciej Suminski 2018-02-21 17:46:46 +01:00
parent dd04bcbcbf
commit fad0452c0e
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@ -679,16 +679,6 @@ if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES )
set( WXPYTHON_VERSION ${_wxpy_version} CACHE STRING "wxPython version found." ) set( WXPYTHON_VERSION ${_wxpy_version} CACHE STRING "wxPython version found." )
message( STATUS "wxPython version ${_wxpy_version} found." ) message( STATUS "wxPython version ${_wxpy_version} found." )
endif()
#message( STATUS "PYTHON_INCLUDE_DIRS:${PYTHON_INCLUDE_DIRS}" )
# Infrequently needed headers go at end of search paths, append to INC_AFTER which
# although is used for all components, should be a harmless hit for something like eeschema
# so long as unused search paths are at the end like this.
set( INC_AFTER ${INC_AFTER} ${PYTHON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/scripting )
#message( STATUS "/ INC_AFTER:${INC_AFTER}" )
# Compare wxPython and wxWidgets toolkits # Compare wxPython and wxWidgets toolkits
@ -714,7 +704,16 @@ if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES )
"${wxWidgets_TOOLKIT_FOUND} or add '-DKICAD_SCRIPTING_WXPYTHON=OFF' to cmake " "${wxWidgets_TOOLKIT_FOUND} or add '-DKICAD_SCRIPTING_WXPYTHON=OFF' to cmake "
"parameters to disable wxPython support." ) "parameters to disable wxPython support." )
endif() endif()
endif()
#message( STATUS "PYTHON_INCLUDE_DIRS:${PYTHON_INCLUDE_DIRS}" )
# Infrequently needed headers go at end of search paths, append to INC_AFTER which
# although is used for all components, should be a harmless hit for something like eeschema
# so long as unused search paths are at the end like this.
set( INC_AFTER ${INC_AFTER} ${PYTHON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/scripting )
#message( STATUS "/ INC_AFTER:${INC_AFTER}" )
endif() endif()
if( APPLE ) if( APPLE )