From d27da058a2dbed6d12d70b160d1f5a518341a638 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Wed, 20 Jun 2018 22:13:21 +0100 Subject: [PATCH] Working on dlib cmake. --- .travis.yml | 1 - CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9785158..02bcfde4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ branches: only: - master - develop - - feature/dlib-update compiler: - gcc diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e364b62..246f02db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,7 +206,7 @@ endif() # dlib library, allow specifying own or use the included one if(NOT DEFINED ${DLIB_INCLUDE_DIR}) set(DLIB_INCLUDE_DIR lib/3rdParty/dlib) - set(DLIB_LIBRARY dlib.lib) + set(DLIB_LIBRARY ${CMAKE_BINARY_DIR}/lib/3rdParty/dlib/dlib/libdlib.a) add_subdirectory(lib/3rdParty/dlib) endif()