merged

dlib/cmake_utils/add_python_module

@@ -75,6 +75,23 @@ else()
     FIND_PACKAGE(PythonLibs 2.6)
 endif()
 
+if (CMAKE_COMPILER_IS_GNUCXX)
+    # Just setting CMAKE_POSITION_INDEPENDENT_CODE should be enough to set
+    # -fPIC for GCC but sometimes it still doesn't get set, so make sure it
+    # does.
+    add_definitions("-fPIC")
+    set(CMAKE_POSITION_INDEPENDENT_CODE True)
+else()
+    set(CMAKE_POSITION_INDEPENDENT_CODE True)
+endif()
+
+# include dlib so we can link against it
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/.. dlib_build)
+if (USING_OLD_VISUAL_STUDIO_COMPILER)
+   message(FATAL_ERROR "You have to use a version of Visual Studio that supports C++11.  As of November 2017, the only version that has good enough C++11 support to compile the dlib Pyhton API is Visual Studio 2015.  Visual Studio 2017 has WORSE C++11 support than Visual Studio 2015, so Visual Studio 2017 is unable to compile the Pyhton API.  ***USE VISUAL STUDIO 2015 INSTEAD***")
+endif()
+
+
 if (NOT Boost_FOUND)
     message(STATUS " *****************************************************************************************************")
     if (WIN32)
@@ -100,7 +117,7 @@ if (NOT Boost_FOUND)
         message(STATUS " Next, if you aren't using python setup.py then you will be invoking cmake to compile dlib.  ")
         message(STATUS " In this case you may have to use cmake's -G option to set the 64 vs. 32bit mode of visual studio. ")
         message(STATUS " Also, if you want a Python3 library you will need to add -DPYTHON3=1.  You do this with a statement like: ")
-        message(STATUS "    cmake -G \"Visual Studio 12 2013 Win64\" -DPYTHON3=1 ..\\..\\tools\\python")
+        message(STATUS "    cmake -G \"Visual Studio 14 2015 Win64\" -DPYTHON3=1 ..\\..\\tools\\python")
         message(STATUS " Rather than:")
         message(STATUS "    cmake ..\\..\\tools\\python")
         message(STATUS " Which will build a 32bit Python2 module by default on most systems.")
@@ -124,20 +141,6 @@ if (WIN32)
     message(STATUS "USING PYTHON_LIBS: ${PYTHON_LIBRARIES}")
 endif()
 
-if (CMAKE_COMPILER_IS_GNUCXX)
-    # Just setting CMAKE_POSITION_INDEPENDENT_CODE should be enough to set
-    # -fPIC for GCC but sometimes it still doesn't get set, so make sure it
-    # does.
-    add_definitions("-fPIC")
-    set(CMAKE_POSITION_INDEPENDENT_CODE True)
-else()
-    set(CMAKE_POSITION_INDEPENDENT_CODE True)
-endif()
-
-# include dlib so we can link against it
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/.. dlib_build)
-
-
 # We put the extra _ on the end of the name just so it's possible to
 # have a module name of dlib and not get a conflict with the target named
 # dlib in ../dlib/cmake.  We use the target OUPUT_NAME property to ensure the

dlib/cmake_utils/set_compiler_specific_options.cmake

@@ -14,6 +14,15 @@ elseif(MSVC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.24215.1 )
    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.")
    set(USING_OLD_VISUAL_STUDIO_COMPILER 1)
+elseif(MSVC AND (MSVC_VERSION EQUAL 1911 OR MSVC_VERSION EQUAL 1910))
+   message(STATUS "******************************************************************************************")
+   message(STATUS "Visual Studio 2017 has incomplete C++11 support and is unable to compile the DNN examples.")
+   message(STATUS "So we are disabling the deep learning tools.  If you want to use the DNN tools in ")
+   message(STATUS "dlib then use Visual Studio 2015 which, surprisingly, has better C++11 support.")
+   message(STATUS "Or if you are reading this in the future and a newer version of Visual Studio that ")
+   message(STATUS "supports C++11 is available then use that.")
+   message(STATUS "******************************************************************************************")
+   set(USING_OLD_VISUAL_STUDIO_COMPILER 1)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)

examples/CMakeLists.txt

@@ -125,7 +125,7 @@ if (NOT USING_OLD_VISUAL_STUDIO_COMPILER)
    add_gui_example(dnn_mmod_find_cars2_ex)
    add_example(dnn_mmod_train_find_cars_ex)
    if (NOT MSVC)
-      # Don't try to compile this program using Visual Studio since it causes the
+      # Don't try to compile these programs 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)