Browse Source

Remove all mentions of GCC < 4.7 and MSVC < 2015 compatibility.

No longer I'm willing to go through that pain.
pull/181/head
Vladimír Vondruš 10 years ago
parent
commit
8cb82c7ab7
  1. 9
      CMakeLists.txt
  2. 8
      README.md
  3. 15
      doc/building.dox
  4. 8
      doc/getting-started.dox

9
CMakeLists.txt

@ -163,15 +163,6 @@ if(BUILD_TESTS)
enable_testing()
endif()
# Check compiler compatibility
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
message(FATAL_ERROR "Compatibility branch of Magnum is needed for use with GCC < 4.7. See the documentation for more information.")
elseif(MSVC)
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.0")
message(FATAL_ERROR "Compatibility branch of Magnum is needed for use with MSVC < 2015. See the documentation for more information.")
endif()
endif()
# If targeting NaCl, set explicit OpenGL ES 2.0 support. For Android and
# Emscripten the decision between ES 2.0 / WebGL 1.0 and ES 3.0 / WebGL 2.0
# must be done by the user.

8
README.md

@ -89,11 +89,9 @@ comprehensive guide for building, packaging and crosscompiling.
Minimal dependencies
--------------------
- C++ compiler with good C++11 support. Compilers which are tested to have
everything needed are **GCC** >= 4.7, **Clang** >= 3.1 and **MSVC** 2015.
On Windows you can also use **MinGW-w64**. GCC 4.6, 4.5, 4.4 and MSVC 2013
support involves some ugly workarounds and thus is available only in
`compatibility` branch.
* C++ compiler with good C++11 support. Compilers which are tested to have
everything needed are **GCC** >= 4.7, **Clang** >= 3.1 and **MSVC** >=
2015. On Windows you can also use **MinGW-w64**.
* **CMake** >= 2.8.12
* **Corrade** - Plugin management and utility library. You can get it at
https://github.com/mosra/corrade.

15
doc/building.dox

@ -33,10 +33,8 @@ namespace Magnum {
Minimal set of tools and libraries required for building is:
- C++ compiler with good C++11 support. Compilers which are tested to have
everything needed are **GCC** >= 4.7, **Clang** >= 3.1 and **MSVC** 2015.
On Windows you can also use **MinGW-w64**. GCC 4.6, 4.5, 4.4 and MSVC 2013
support involves some ugly workarounds and thus is available only in
`compatibility` branch.
everything needed are **GCC** >= 4.7, **Clang** >= 3.1 and **MSVC** >=
2015. On Windows you can also use **MinGW-w64**.
- **CMake** >= 2.8.12
- **Corrade** - Plugin management and utility library. See
@ref building-corrade "Corrade download and installation guide" for more
@ -52,12 +50,6 @@ compressed archive or use the command line:
git clone git://github.com/mosra/magnum.git
If you need to use the `compatibility` branch, check it out as following from
the cloned repository or download the particular archive from
https://github.com/mosra/magnum/tree/compatibility.
git checkout compatibility
@section building-compilation Compilation, installation
Relevant information about CMake usage was described in
@ -103,8 +95,7 @@ value to that directory (e.g. `-DCMAKE_INSTALL_PREFIX=C:/Sys`).
@subsubsection building-windows-msvc Using Visual Studio
On Windows CMake by default creates Visual Studio project files. You need to
use `compatibility` branch to compile with MSVC 2013, as said above.
On Windows CMake by default creates Visual Studio project files.
The most straightforward way to build and install the library is again via the
command-line. The bonus point is that you don't even need to wait for Visual

8
doc/getting-started.dox

@ -59,14 +59,6 @@ dependencies means just cloning them into your project tree:
git clone git://github.com/mosra/corrade.git
git clone git://github.com/mosra/magnum.git
The `master` branch supports GCC 4.7+, Clang and MSVC 2015 compilers, for older
versions you need to use `compatibility` branches, please see
@ref building-corrade "Corrade" and @ref building "Magnum" installation guides
for detailed information. If you are using `compatibility` branch of Magnum and
Corrade, replace `modules/FindCorrade.cmake` from the bootstrap project with
[the one from compatibility branch](https://github.com/mosra/corrade/blob/compatibility/modules/FindCorrade.cmake)
so the compatibility mode gets properly detected and used.
Then open the `CMakeLists.txt` file in the root of bootstrap project and add
these two new subdirectories using `add_subdirectory()` so the file looks like
this:

Loading…
Cancel
Save