merged

dlib/CMakeLists.txt

@@ -32,10 +32,14 @@ if(has_parent)
    endif()
 endif()
 
-# Set only because there are old target_link_libraries() statements in the
-# FindCUDA.cmake file that comes with CMake that error out if the new behavior
-# is used.
-cmake_policy(SET CMP0023 OLD)
+if (CMAKE_VERSION VERSION_LESS "3.9.0")
+   # Set only because there are old target_link_libraries() statements in the
+   # FindCUDA.cmake file that comes with CMake that error out if the new behavior
+   # is used.  In newer versions of CMake we can instead set CUDA_LINK_LIBRARIES_KEYWORD which fixes this issue.
+   cmake_policy(SET CMP0023 OLD)
+else()
+   set(CUDA_LINK_LIBRARIES_KEYWORD PUBLIC)
+endif()
 
 
 macro (enable_preprocessor_switch option_name)

dlib/java/CMakeLists.txt

@@ -5,7 +5,6 @@ set(java_package_name net.dlib)
 set(source_files
    )
 
-include(../cmake_utils/use_cpp_11.cmake)
 include(../cmake_utils/release_build_by_default)
 
 include_directories(
@@ -13,7 +12,7 @@ include_directories(
    )
 
 # Additional dependencies
-#include(../../dlib/cmake)
+#add_subdirectory(../../dlib dlib_build)
 #set(additional_link_libraries dlib::dlib)
 
 # Tell swig to put the output files (the shared library and .jar) into the local folder.

dlib/java/cmake_swig_jni

@@ -42,6 +42,8 @@
 
 cmake_minimum_required (VERSION 2.8.12)
 
+include(${CMAKE_CURRENT_LIST_DIR}/../cmake_utils/use_cpp_11.cmake)
+
 # This block of code tries to figure out what the JAVA_HOME environment
 # variable should be by looking at the folder that contains the java
 # executable.
@@ -178,6 +180,7 @@ FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${binary_dir_name}")
 
 set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/swig.i PROPERTIES CPLUSPLUS ON)
 swig_add_module(${output_library_name} java ${CMAKE_CURRENT_BINARY_DIR}/swig.i ${source_files})
+enable_cpp11_for_target(${output_library_name})
 
 include_directories(${JNI_INCLUDE_DIRS})
 swig_link_libraries(${output_library_name}  ${additional_link_libraries})

dlib/matlab/CMakeLists.txt

 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 2.8.12)
 
 PROJECT(mex_functions)
 
 include(cmake_mex_wrapper)
 
-include(../cmake)
+add_subdirectory(.. dlib_build)
 
 # Compile the example_mex_function.cpp file and link it to dlib.  Note
 # that you can give a list of things to link to here.  E.g. 
 #    add_mex_function(some_other_mex_function pthread dlib fftw) 
-add_mex_function(example_mex_function dlib)
-add_mex_function(example_mex_callback dlib)
-add_mex_function(example_mex_struct dlib)
-add_mex_function(example_mex_class dlib)
+add_mex_function(example_mex_function dlib::dlib)
+add_mex_function(example_mex_callback dlib::dlib)
+add_mex_function(example_mex_struct dlib::dlib)
+add_mex_function(example_mex_class dlib::dlib)
 

dlib/matlab/cmake_mex_wrapper

@@ -3,7 +3,7 @@
 # that additional library dependencies can be added like this: add_mex_function(name lib1 dlib libetc).
 # That is, just add more libraries after the name and they will be build into the mex file.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 2.8.12)
 
 set(BUILDING_MATLAB_MEX_FILE true)
 set(CMAKE_POSITION_INDEPENDENT_CODE True)
@@ -57,8 +57,7 @@ INCLUDE_DIRECTORIES("${dlib_matlab_binding_path}")
 # Also add dlib to the include search path 
 INCLUDE_DIRECTORIES(${dlib_matlab_binding_path}/../..) 
 
-include(${dlib_matlab_binding_path}/../cmake_utils/add_global_compiler_switch.cmake)
-add_global_define(MATLAB_MEX_FILE)
+add_definitions(-DMATLAB_MEX_FILE)
 
 # Determine the path to our CMakeLists.txt file.  This is the file that
 # includeded the one you are reading right now.  So here we make it so that