Skip to content

Commit

Permalink
Froze dlib to latest current version (v19.13) instead of always using…
Browse files Browse the repository at this point in the history
… the latest commit from master
  • Loading branch information
cchadowitz committed Jun 13, 2018
1 parent 79ca9ca commit d5abc88
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions CMakeLists.txt
Expand Up @@ -122,7 +122,10 @@ endif()

if (USE_DLIB)
# Dlib
message(STATUS "Using Dlib")

# Currently supported release version of dlib
set(DLIB_RELEASE_VERSION v19.13)
message(STATUS "Using Dlib version ${DLIB_RELEASE_VERSION}")
add_definitions(-DUSE_DLIB)

if (CUDA_FOUND AND NOT USE_DLIB_CPU_ONLY)
Expand All @@ -133,7 +136,7 @@ if (USE_DLIB)
dlib
PREFIX dlib
INSTALL_DIR ${CMAKE_BINARY_DIR}
DOWNLOAD_COMMAND git clone https://github.com/davisking/dlib.git
URL https://github.com/davisking/dlib/archive/${DLIB_RELEASE_VERSION}.tar.gz
CONFIGURE_COMMAND cd dlib && mkdir build && cd build && cmake .. -DDLIB_NO_GUI_SUPPORT=ON -DDLIB_USE_CUDA=ON -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/dlib/build && cmake --build . --config Release --target install
BUILD_COMMAND ""
INSTALL_COMMAND ""
Expand All @@ -143,14 +146,14 @@ if (USE_DLIB)
set(DLIB_LIB_DIR ${CMAKE_BINARY_DIR}/dlib/build/lib)
else()
ExternalProject_Add(
dlib
PREFIX dlib
INSTALL_DIR ${CMAKE_BINARY_DIR}
DOWNLOAD_COMMAND git clone https://github.com/davisking/dlib.git
CONFIGURE_COMMAND cd dlib && mkdir build && cd build && cmake .. -DDLIB_NO_GUI_SUPPORT=ON -DDLIB_USE_CUDA=OFF -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/dlib/build && cmake --build . --config Release --target install
BUILD_COMMAND ""
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
dlib
PREFIX dlib
INSTALL_DIR ${CMAKE_BINARY_DIR}
URL https://github.com/davisking/dlib/archive/${DLIB_RELEASE_VERSION}.tar.gz
CONFIGURE_COMMAND cd dlib && mkdir build && cd build && cmake .. -DDLIB_NO_GUI_SUPPORT=ON -DDLIB_USE_CUDA=OFF -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/dlib/build && cmake --build . --config Release --target install
BUILD_COMMAND ""
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
set(DLIB_INC_DIR ${CMAKE_BINARY_DIR}/dlib/build/include)
set(DLIB_LIB_DIR ${CMAKE_BINARY_DIR}/dlib/build/lib)
Expand Down

0 comments on commit d5abc88

Please sign in to comment.