From cd57ef8c6ef0ffe18cfc61359e7ab55156e0dc3f Mon Sep 17 00:00:00 2001
From: Scott Klum <scott.klum@gmail.com>
Date: Fri, 22 Feb 2013 15:24:37 -0500
Subject: [PATCH] Stasm complete

---
 sdk/plugins/nec3.cmake             |  2 +-
 sdk/plugins/stasm.cmake            | 15 +++++++++++++++
 sdk/plugins/stasm.cpp              |  2 +-
 share/openbr/cmake/FindPBD.cmake   |  2 --
 share/openbr/cmake/FindStasm.cmake | 16 ++++++++++++++++
 5 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 sdk/plugins/stasm.cmake
 create mode 100644 share/openbr/cmake/FindStasm.cmake

diff --git a/sdk/plugins/nec3.cmake b/sdk/plugins/nec3.cmake
index af22782..95cdd24 100644
--- a/sdk/plugins/nec3.cmake
+++ b/sdk/plugins/nec3.cmake
@@ -1,4 +1,4 @@
-set(BR_WITH_NEC3 OFF CACHE BOOL "Build with NEC NeoFaceDSK 3")
+set(BR_WITH_NEC3 OFF CACHE BOOL "Build with NEC NeoFaceSDK 3")
 
 if(${BR_WITH_NEC3})
   find_package(NEC3 REQUIRED)
diff --git a/sdk/plugins/stasm.cmake b/sdk/plugins/stasm.cmake
new file mode 100644
index 0000000..0975003
--- /dev/null
+++ b/sdk/plugins/stasm.cmake
@@ -0,0 +1,15 @@
+set(BR_WITH_STASM OFF CACHE BOOL "Build with Stasm")
+
+if(${BR_WITH_STASM})
+  find_package(Stasm REQUIRED)
+  set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/stasm.cpp)
+  set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${Stasm_LIBS})
+
+  if(WIN32)
+    install(DIRECTORY ${Stasm_DIR}/lib/ DESTINATION bin)
+  else()
+    install(DIRECTORY ${Stasm_DIR}/lib/ DESTINATION lib)
+  endif()
+
+  install(DIRECTORY ${Stasm_DIR}/models/ DESTINATION share/openbr/models/stasm)
+endif()
diff --git a/sdk/plugins/stasm.cpp b/sdk/plugins/stasm.cpp
index 0f7d61a..966726b 100644
--- a/sdk/plugins/stasm.cpp
+++ b/sdk/plugins/stasm.cpp
@@ -56,7 +56,7 @@ class StasmTransform : public UntrainableTransform
 
         AsmSearchDll(&nlandmarks, landmarks,
                      src.file.name.toStdString().c_str(), reinterpret_cast<char*>(src.m().data), src.m().cols, src.m().rows,
-                     src.m(), (src.m().channels() == 3), NULL, NULL);
+                     src.m(), (src.m().channels() == 3), qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-68-1d.conf"),  qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-76-2d.conf"));
 
         if (nlandmarks == 0) qFatal("Unable to detect Stasm landmarks");
 
diff --git a/share/openbr/cmake/FindPBD.cmake b/share/openbr/cmake/FindPBD.cmake
index e116db2..e2044f9 100644
--- a/share/openbr/cmake/FindPBD.cmake
+++ b/share/openbr/cmake/FindPBD.cmake
@@ -13,8 +13,6 @@ include_directories(${PBD_DIR}/include)
 link_directories(${PBD_DIR}/lib)
 
 find_package(Boost COMPONENTS system serialization REQUIRED)
-message(${Boost_INCLUDE_DIR})
-message(${Boost_LIBRARIES})
 include_directories(${Boost_INCLUDE_DIR})
 link_directories(${Boost_LIBRARY_DIRS})
 set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${Boost_LIBRARIES})
diff --git a/share/openbr/cmake/FindStasm.cmake b/share/openbr/cmake/FindStasm.cmake
new file mode 100644
index 0000000..5c12554
--- /dev/null
+++ b/share/openbr/cmake/FindStasm.cmake
@@ -0,0 +1,16 @@
+# ================================================================
+# The Stasm CMake configuration file
+#
+# Usage from an external project:
+#   In your CMakeLists.txt, add these lines:
+#
+#   find_package(Stasm REQUIRED)
+#   target_link_libraries(MY_TARGET ${Stasm_LIBS})
+# ================================================================
+
+find_path(Stasm_DIR include/stasm.hpp ${CMAKE_SOURCE_DIR}/3rdparty/*)
+
+include_directories(${Stasm_DIR}/include)
+link_directories(${Stasm_DIR}/lib)
+
+set(Stasm_LIBS stasm)
--
libgit2 0.21.4