More cmake script cleanup

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