CMake: make docs and code consistent.

- Document the version requirements more accurately
main
Adriaan de Groot 7 years ago
parent 5643ee4b8f
commit 6a36e1dc8e

@ -96,7 +96,7 @@ set( QT_VERSION 5.7.0 )
set( YAMLCPP_VERSION 0.5.1 ) set( YAMLCPP_VERSION 0.5.1 )
set( ECM_VERSION 5.18 ) set( ECM_VERSION 5.18 )
set( PYTHONLIBS_VERSION 3.3 ) set( PYTHONLIBS_VERSION 3.3 )
set( BOOSTPYTHON_VERSION 1.54.0 ) set( BOOSTPYTHON_VERSION 1.55.0 )
### CMAKE SETUP ### CMAKE SETUP

@ -15,11 +15,12 @@
Main: Main:
* Compiler with C++11 support: GCC >= 4.9.0 or Clang >= 3.5.1 * Compiler with C++11 support: GCC >= 4.9.0 or Clang >= 3.5.1
* CMake >= 3.2 * CMake >= 3.2
* Qt >= 5.6 * Qt >= 5.7
* yaml-cpp >= 0.5.1 * yaml-cpp >= 0.5.1
* Python >= 3.3 * Python >= 3.3 (required for some modules)
* Boost.Python >= 1.55.0 * Boost.Python >= 1.55.0 (recommended, or PythonQt; one is required for some modules)
* extra-cmake-modules (recommended; required for some modules) * PythonQt (recommended, or Boost.Python; one is required for some modules)
* extra-cmake-modules >= 5.18 (recommended; required for some modules)
Modules: Modules:
* welcome: * welcome:
@ -38,6 +39,6 @@ Modules:
### Building ### Building
See [wiki](https://github.com/calamares/calamares/wiki) for up to date See [wiki](https://github.com/calamares/calamares/wiki) for up to date
[building](https://github.com/calamares/calamares/wiki/Developer's-Guide) [building](https://github.com/calamares/calamares/wiki/Develop-Guide)
and [deployment](https://github.com/calamares/calamares/wiki/Deployer's-Guide) and [deployment](https://github.com/calamares/calamares/wiki/Deploy-Guide)
instructions. instructions.

Loading…
Cancel
Save