automatically build dlib by default

Josh Klontz
1 parent 4650acf7
Showing 5 changed files with 15 additions and 6 deletions
.gitignore
CMakeLists.txt
openbr/plugins/classification/dlib.cpp
openbr/plugins/cmake/dlib.cmake
share/openbr/models
@@ -2,6 +2,7 @@
 3rdparty/LatentSDK*
 3rdparty/pittpatt*
 3rdparty/cvmatio
+3rdparty/dlib*
 data/*/img
 data/*/vid
 data/PCSO/*
@@ -43,6 +43,8 @@ else()
   set(BITNESS 32)
 endif()
  
+include(ExternalProject)
+
 # Define resources
 if(WIN32)
   set(CPACK_PACKAGE_ICON "${BR_SHARE_DIR}\\\\openbr_small.png")
@@ -2,11 +2,13 @@
 #include "openbr/core/qtutils.h"
 #include "openbr/core/eigenutils.h"
  
+#define DLIB_NO_GUI_SUPPORT
 #include <dlib/image_processing/frontal_face_detector.h>
 #include <dlib/svm_threaded.h>
 #include <dlib/image_processing.h>
 #include <dlib/image_io.h>
 #include <dlib/opencv.h>
+#include <dlib/all/source.cpp>
  
 #include <QTemporaryFile>
  
-set(BR_WITH_DLIB OFF CACHE BOOL "Build with DLib")
+set(BR_WITH_DLIB ON CACHE BOOL "Build with DLib")
  
 if(${BR_WITH_DLIB})
-  find_package(DLib REQUIRED)
-  add_definitions(-DDLIB_NO_GUI_SUPPORT)
-  set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} ${DLib_DIR}/dlib/all/source.cpp)
-  install(DIRECTORY ${DLib_DIR}/models/ DESTINATION share/openbr/models/dlib)
+  ExternalProject_Add(dlib
+                      URL http://downloads.sourceforge.net/project/dclib/dlib/v18.16/dlib-18.16.tar.bz2
+                      URL_MD5 e9e5449bc25370afce2d254327afac99
+                      SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/dlib-18.16"
+                      CONFIGURE_COMMAND ""
+                      BUILD_COMMAND ""
+                      INSTALL_COMMAND "")
+  include_directories("${CMAKE_SOURCE_DIR}/3rdparty/dlib-18.16")
 else()
   set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/classification/dlib.cpp)
 endif()
-Subproject commit 85842e6da7738e317b9d40d5a395b92cd7b996e1
+Subproject commit e0fa4314abdda0dea598f24609601e2323670969