OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

merged

This commit is contained in:
Davis King 2017-08-24 18:42:01 -04:00
parent 30ca8b4228 18c42f3e77
commit df03b6fbed
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlib/CMakeLists.txt
View File

@ -523,7 +523,7 @@ if (NOT TARGET dlib)
# -std=c++11 option if you let it propagate it to nvcc in some # -std=c++11 option if you let it propagate it to nvcc in some
# cases. So instead we disable this and manually include # cases. So instead we disable this and manually include
# things from CMAKE_CXX_FLAGS in the CUDA_NVCC_FLAGS list below. # things from CMAKE_CXX_FLAGS in the CUDA_NVCC_FLAGS list below.
if (APPLE) if (APPLE OR MSVC)
set(CUDA_PROPAGATE_HOST_FLAGS OFF) set(CUDA_PROPAGATE_HOST_FLAGS OFF)
# Grab all the -D flags from CMAKE_CXX_FLAGS so we can pass them # Grab all the -D flags from CMAKE_CXX_FLAGS so we can pass them
# to nvcc. # to nvcc.

5
dlib/cmake_utils/use_cpp_11.cmake
View File

@ -58,6 +58,11 @@ if (CMAKE_VERSION VERSION_LESS "3.1.2")
# Since we don't know what compiler this is just try to build a c++11 project and see if it compiles. # Since we don't know what compiler this is just try to build a c++11 project and see if it compiles.
test_compiler_for_cpp11() test_compiler_for_cpp11()
endif() endif()
elseif( MSVC AND CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.3)
# Clang can compile all Dlib's code at Windows platform. Tested with Clang 5
message(STATUS "C++11 activated.")
add_global_compiler_switch("-Xclang -fcxx-exceptions -Xclang -Wno-microsoft-pure-definition -Xclang -Wno-unused-local-typedef")
set(COMPILER_CAN_DO_CPP_11 1)
elseif(MSVC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.24215.1 ) elseif(MSVC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.24215.1 )
message(STATUS "NOTE: Visual Studio didn't have good enough C++11 support until Visual Studio 2015 update 3 (v19.0.24215.1)") message(STATUS "NOTE: Visual Studio didn't have good enough C++11 support until Visual Studio 2015 update 3 (v19.0.24215.1)")
message(STATUS "So we aren't enabling things that require full C++11 support (e.g. the deep learning tools).") message(STATUS "So we aren't enabling things that require full C++11 support (e.g. the deep learning tools).")