"tests/dist/git@developer.sourcefind.cn:OpenDAS/dgl.git" did not exist on "33a2d9e1b6fbadf27662e0a8fadee1ed1bba1f68"
Commit ded68b9a authored by Davis King's avatar Davis King
Browse files

Cleanup gcc version checking code a little.

Also fix this error from cmake 3.5.1:

```
CMake Error at CMakeLists.txt:62 (if):
  if given arguments:

    "CMAKE_COMPILER_IS_GNUCXX" "AND" "CMAKE_CXX_COMPILER_VERSION" "VERSION_LESS_EQUAL" "4.8.5"

  Unknown arguments specified
```
parent 8e9755ab
...@@ -58,11 +58,6 @@ if(has_parent) ...@@ -58,11 +58,6 @@ if(has_parent)
endif() endif()
endif() endif()
# As of dlib 19.22, GCC 4.8.5 is no longer supported, building will fail, so let users know.
if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 4.8.5)
message(FATAL_ERROR "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_VERSION} is too old for dlib ${VERSION}.\n\
Either update your compiler to be fully compliant with C++11 or build an older version of dlib, such as 19.21.")
endif()
if (COMMAND pybind11_add_module AND MSVC) if (COMMAND pybind11_add_module AND MSVC)
# True when building a python extension module using Visual Studio. We care # True when building a python extension module using Visual Studio. We care
......
...@@ -46,8 +46,8 @@ endif() ...@@ -46,8 +46,8 @@ endif()
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
if (GCC_VERSION VERSION_LESS 4.8) if (GCC_VERSION VERSION_LESS 4.9)
message(FATAL_ERROR "C++11 is required to use dlib, but the version of GCC you are using is too old and doesn't support C++11. You need GCC 4.8 or newer. ") message(FATAL_ERROR "C++11 is required to use dlib, but the version of GCC you are using is too old and doesn't support C++11. You need GCC 4.9 or newer. ")
endif() endif()
endif() endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment