Commit f213e68c98e306d15b1c953dc9b103084553b154

Authored by Jordan Cheney
2 parents f1d8a9e3 8fde04e6

Merge branch 'master' into reorg

app/examples/face_recognition_evaluation.cpp
@@ -36,7 +36,7 @@ int main(int argc, char *argv[]) @@ -36,7 +36,7 @@ int main(int argc, char *argv[])
36 { 36 {
37 br_initialize(argc, argv); 37 br_initialize(argc, argv);
38 38
39 - // Equivalent to 'Globals->algorithm = "FaceRecognion";' in C++ API 39 + // Equivalent to 'Globals->algorithm = "FaceRecognition";' in C++ API
40 br_set_property("algorithm", "FaceRecognition"); 40 br_set_property("algorithm", "FaceRecognition");
41 41
42 // Equivalent to 'Globals->path = "../data/MEDS/img/";' in C++ API 42 // Equivalent to 'Globals->path = "../data/MEDS/img/";' in C++ API
share/openbr/cmake/FindLibLinear.cmake
1 find_path(LibLinear_DIR linear.h ${CMAKE_SOURCE_DIR}/3rdparty/*) 1 find_path(LibLinear_DIR linear.h ${CMAKE_SOURCE_DIR}/3rdparty/*)
2 2
3 -message(${LibLinear_DIR})  
4 mark_as_advanced(LibLinear_DIR) 3 mark_as_advanced(LibLinear_DIR)
5 include_directories(${LibLinear_DIR}) 4 include_directories(${LibLinear_DIR})
6 include_directories(${LibLinear_DIR}/blas) 5 include_directories(${LibLinear_DIR}/blas)