Commit 3a65e1c7 authored by Davis King's avatar Davis King

Apparently you need gcc 4.7 or newer for this stuff.

parent bf93f4f3
......@@ -409,7 +409,7 @@ if (NOT TARGET dlib)
find_package(CUDA 7.0)
if (CUDA_FOUND)
if (CUDA_FOUND AND COMPILER_CAN_DO_CPP_11)
set(CUDA_HOST_COMPILATION_CPP ON)
# Note that we add __STRICT_ANSI__ to avoid freaking out nvcc with gcc specific
......
......@@ -24,10 +24,6 @@ if (CMAKE_VERSION VERSION_LESS "3.1")
message(STATUS "C++11 activated.")
add_global_compiler_switch("-std=gnu++11")
set(COMPILER_CAN_DO_CPP_11 1)
elseif(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
message(STATUS "C++0x activated.")
add_global_compiler_switch("-std=gnu++0x")
set(COMPILER_CAN_DO_CPP_11 1)
endif()
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
execute_process( COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE clang_full_version_string )
......
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