Commit df0f62d4 authored by Davis King's avatar Davis King

merged

parents 6137540b fef4a365
...@@ -28,9 +28,8 @@ if(NOT TARGET dlib-shared AND NOT dlib_BINARY_DIR) ...@@ -28,9 +28,8 @@ if(NOT TARGET dlib-shared AND NOT dlib_BINARY_DIR)
include("${dlib_CMAKE_DIR}/dlib.cmake") include("${dlib_CMAKE_DIR}/dlib.cmake")
endif() endif()
find_library(dlib_LIBRARIES dlib HINTS "@CMAKE_INSTALL_FULL_LIBDIR@") set(dlib_LIBRARIES dlib::dlib)
set(dlib_LIBRARIES ${dlib_LIBRARIES} "@dlib_needed_libraries@") set(dlib_LIBS dlib::dlib)
set(dlib_LIBS ${dlib_LIBRARIES} "@dlib_needed_libraries@")
set(dlib_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@" "@dlib_needed_includes@") set(dlib_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@" "@dlib_needed_includes@")
mark_as_advanced(dlib_LIBRARIES) mark_as_advanced(dlib_LIBRARIES)
......
...@@ -2120,6 +2120,7 @@ namespace ...@@ -2120,6 +2120,7 @@ namespace
void test_simple_linear_regression_with_mult_prev() void test_simple_linear_regression_with_mult_prev()
{ {
srand(1234);
print_spinner(); print_spinner();
const int num_samples = 1000; const int num_samples = 1000;
::std::vector<matrix<double>> x(num_samples); ::std::vector<matrix<double>> x(num_samples);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment