Skip to content

Commit 819b767

Browse files
committed
Bump to requiring wxWidgets 3.2.0
By the time 8.0 is out, we will not be supporting any platforms on wxWidgets older than 3.2.0
1 parent 88062c5 commit 819b767

File tree

2 files changed

+12
-100
lines changed

2 files changed

+12
-100
lines changed

CMakeLists.txt

+9-1
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,10 @@ if( KICAD_SCRIPTING_WXPYTHON )
938938
if( WXPYTHON_VERSION VERSION_LESS 4.0.0 )
939939
message( FATAL_ERROR "wxPython Phoenix is required" )
940940
endif()
941+
942+
if( WXPYTHON_WXVERSION VERSION_LESS 3.2.0 )
943+
message( FATAL_ERROR "wxWidgets 3.2.0 or greater is required" )
944+
endif()
941945
endif()
942946

943947
# GTK3 is required on Linux
@@ -975,7 +979,11 @@ else()
975979
endif()
976980

977981
# Require the same wxWidgets version as is used by wxPython
978-
set( wxWidgets_REQ_VERSION ${WXPYTHON_WXVERSION} )
982+
if( KICAD_SCRIPTING_WXPYTHON )
983+
set( wxWidgets_REQ_VERSION ${WXPYTHON_WXVERSION} )
984+
else()
985+
set( wxWidgets_REQ_VERSION 3.2.0 )
986+
endif()
979987

980988
# See line 49 of cmake/FindwxWidgets.cmake
981989
set( wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --static=no )

INSTALL.txt

+3-99
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,12 @@ The parts of KiCad
1717
Installation from binary packages
1818
---------------------------------
1919

20-
Compiled KiCad binaries exist for Windows (8.1, 10), macOS (10.14+), and several
21-
Linux distributions (Fedora, Debian, Ubuntu, Arch). These are available from the
22-
main KiCad website: https://kicad.org/download/
20+
Check the KiCad website for packages and installation instructions for
21+
all supported platforms: https://kicad.org/download/
2322

2423
Data files (schematics, boards, libraries) are compatible with all platforms.
2524

2625

27-
Installation from binary packages for Windows
28-
---------------------------------------------
29-
30-
KiCad can be installed anywhere on the system as long as the user has write privileges.
31-
Pre-made installers are available on the KiCad website: https://kicad.org/download/windows/
32-
33-
34-
Installation from binary packages for Linux
35-
-------------------------------------------
36-
37-
KiCad comes packaged on many Linux platforms including Debian, Fedora, Ubuntu and Arch,
38-
and is available in their respective package repositories. More information can be found on
39-
the platform's page at https://kicad.org/download/
40-
41-
4226
Linux install tree
4327
-------------------------------------
4428

@@ -59,74 +43,10 @@ Linux install tree
5943
Do not change the KiCad tree, or the location of binary files. Otherwise
6044
KiCad may not be able to find some or all of its required files.
6145

62-
63-
macOS KiCad tree
64-
----------------
65-
66-
System wide files
67-
68-
/Library/Application Support/kicad/help
69-
/Library/Application Support/kicad/template
70-
/Library/Application Support/kicad/library
71-
/Library/Application Support/kicad/modules
72-
/Library/Application Support/kicad/3dmodels
73-
74-
User files can be the same as the system wide files but only inside the user's home directory.
75-
76-
$HOME/Library/Application Support/kicad
77-
78-
Warning:
79-
These paths are hardcoded into KiCad, if you put them somewhere else KiCad will not find
80-
them when a new project is created.
81-
82-
8346
Installation from source code
8447
-----------------------------
8548

86-
Currently the only supported compilers are GCC on Linux and Windows and Clang on macOS.
87-
88-
Some dependencies must be satisfied for the correct installation of KiCad:
89-
90-
wxWidgets >= 3.0.0 http://www.wxwidgets.org/
91-
92-
CMake >= 3.10.0 https://www.cmake.org/
93-
94-
Boost C++ Libraries >= 1.59 https://www.boost.org/
95-
96-
OpenGL >= 2.1
97-
Linux: Mesa 3D Graphics Library http://www.mesa3d.org/
98-
Windows: built-in
99-
100-
Zlib Compression Library http://www.zlib.net/
101-
102-
cairo >= 1.12 http://cairographics.org/
103-
104-
GLEW http://glew.sourceforge.net/
105-
106-
libcurl http://curl.haxx.se/
107-
108-
OpenMP (optional) http://openmp.org/
109-
110-
GLM >= 9.5.4 http://glm.g-truc.net/
111-
112-
pkg-config http://pkgconfig.freedesktop.org/
113-
114-
Doxygen (optional) http://www.doxygen.nl
115-
116-
Python >= 2.6 (optional) https://python.org/
117-
118-
wxPython (optional) http://www.wxpython.org/
119-
120-
SWIG >= 3.0 (optional) http://swig.org/
121-
122-
libngspice (optional) http://ngspice.sourceforge.net/
123-
124-
One of:
125-
OCE >= 0.18 (optional) https://github.com/tpaviot/oce
126-
127-
OCC >= 6.9.0 (optiona) https://www.opencascade.com/content/latest-release
128-
129-
Complete documentation for building from source can be found at: https://dev-docs.kicad.org/
49+
Current documentation for building from source can be found at: https://dev-docs.kicad.org/
13050

13151

13252
Important parameters to CMake
@@ -140,24 +60,8 @@ Important parameters to CMake
14060
-DCMAKE_INSTALL_PREFIX=<prefix>
14161
Default to "/usr/local".
14262

143-
-DwxWidgets_ROOT_DIR=<wxInstallDir>
144-
Required for Windows platform.
145-
146-
-DwxWidgets_USE_DEBUG=ON
147-
Can be used only with -DCMAKE_BUILD_TYPE=Debug
148-
14963
-DCMAKE_CXX_FLAGS=<some extra flags>
15064
Extra flags for the C++ compiler required for your system.
15165

15266
-DCMAKE_VERBOSE_MAKEFILE=ON
15367
When more output is wanted use this cmake parameter or call "make VERBOSE=1".
154-
155-
156-
Extra CFLAGS and linker flags
157-
-----------------------------
158-
159-
If you require extra flags for compiler and linker you may give them via
160-
environment variables
161-
"CXXFLAGS" (c++ compiler)
162-
"LDFLAGS" (for linker)
163-
"CFLAGS" (for c-compiler, not needed in kdesvn build)

0 commit comments

Comments
 (0)