- Changed cmake file so that it won't print messages about looking for libpng

   - Added some missing #includes to the thread_pool header

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402650

dlib/CMakeLists.txt

@@ -121,22 +121,21 @@ IF (NOT DLIB_ISO_CPP_ONLY)
       endif()
 
       MARK_AS_ADVANCED(nsllib pthreadlib socketlib)
-   ENDIF () #################################################################################
+   ENDIF () ##### end of if NOT DLIB_ISO_CPP_ONLY ##########################################################
 
 
+
+   # try to find libpng 
+   SET(ZLIB_FIND_QUIETLY ON)
+   SET(PNG_FIND_QUIETLY ON)
    INCLUDE(FindPNG)
    if (PNG_FOUND)
       INCLUDE_DIRECTORIES(${PNG_PNG_INCLUDE_DIR})
       set (dlib_needed_libraries ${dlib_needed_libraries} ${PNG_LIBRARY})
       add_global_define(DLIB_PNG_SUPPORT)
-   else()
-      # we could print a message but doing so is sort of irritating when it occurs by default
-      #message(" *************************************************************************")
-      #message(" ****** PNG IMAGE FILE SUPPORT NOT ENABLED BECAUSE libpng NOT FOUND ******")
-      #message(" ****** Make sure libpng is installed if you want PNG support       ******")
-      #message(" *************************************************************************")
    endif()
 
+
    TARGET_LINK_LIBRARIES(dlib ${dlib_needed_libraries} )
 
 ENDIF ()

dlib/threads/thread_pool_extension.h

@@ -4,12 +4,12 @@
 #define DLIB_THREAD_POOl_H__ 
 
 #include "thread_pool_extension_abstract.h"
-#include "dlib/member_function_pointer.h"
+#include "../member_function_pointer.h"
 #include "threads_kernel.h"
 #include "auto_mutex_extension.h"
 #include "multithreaded_object_extension.h"
 #include "../uintn.h"
-#include "dlib/array.h"
+#include "../array.h"
 
 namespace dlib
 {