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

Changed cmake so it compiles most of the DNN examples when using visual studio.

This commit is contained in:
Davis King 2016-10-08 15:28:58 -04:00
parent 1e35214de2
commit f5da9fe2b0
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlib/cmake_utils/use_cpp_11.cmake
View File

@ -50,7 +50,12 @@ if (CMAKE_VERSION VERSION_LESS "3.1.2")
message(STATUS "*** Your compiler failed to build a C++11 project, so dlib won't use C++11 features.***")
endif()
endif()
elseif(NOT MSVC14) # Visual Studio 14 reports that it supports C++11 but it really doesn't :(
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 "So we aren't enabling things that require full C++11 support (e.g. the deep learning tools).")
message(STATUS "Also, be aware that Visual Studio's version naming is confusing, in particular, there are multiple versions of 'update 3'")
message(STATUS "So if you are getting this message you need to update to the newer version of Visual Studio to use full C++11.")
else()
# Set a flag if the compiler you are using is capable of providing C++11 features.
get_property(cxx_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)

7
examples/CMakeLists.txt
View File

@ -44,11 +44,16 @@ if (COMPILER_CAN_DO_CPP_11)
add_example(dnn_introduction2_ex)
add_example(dnn_inception_ex)
add_gui_example(dnn_imagenet_ex)
add_example(dnn_imagenet_train_ex)
add_gui_example(dnn_mmod_ex)
add_gui_example(dnn_mmod_face_detection_ex)
add_gui_example(random_cropper_ex)
add_gui_example(dnn_mmod_dog_hipsterizer)
if (NOT MSVC)
# Don't try to compile this program using Visual Studio since it causes the
# compiler to run out of RAM and to crash. Maybe someday Visual Studio
# won't be broken :(
add_example(dnn_imagenet_train_ex)
endif()
endif()
#here we apply our macros