Finished

Scott Klum
1 parent 582a5454
Showing 4 changed files with 6 additions and 5 deletions
3rdparty/stasm4.0.0/stasm/CMakeLists.txt
openbr/plugins/stasm4.cmake
openbr/plugins/stasm4.cpp
share/openbr/cmake/FindStasm4.cmake
@@ -15,5 +15,5 @@ set_target_properties(stasm PROPERTIES
  
 target_link_libraries(stasm ${OpenCV_LIBS} ${Qt5Core_QTMAIN_LIBRARIES})
  
-install(DIRECTORY include DESTINATION include/stasm)
+install(DIRECTORY include/ DESTINATION include/stasm)
 install(TARGETS stasm RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
@@ -14,5 +14,6 @@ if(${BR_WITH_STASM4})
     install(FILES ${STASM4_LIBS} DESTINATION lib)
   endif()
  
+  install(DIRECTORY ${STASM4_INCLUDE_DIR}/ DESTINATION include)
   install(DIRECTORY ${STASM4_DATA_DIR} DESTINATION share/openbr/models/stasm)
 endif()
-#include <stasm_lib.h>
-#include <stasmcascadeclassifier.h>
+#include <stasm/stasm_lib.h>
+#include <stasm/stasmcascadeclassifier.h>
 #include <opencv2/opencv.hpp>
 #include <Eigen/Dense>
 #include "openbr_internal.h"
@@ -22,7 +22,7 @@ foreach(CACHE_VAR ${CACHE_VARS})
     else()
       set(CACHE_VAR_TYPE :${CACHE_VAR_TYPE})
     endif()
-    set(CMAKE_ARGS "${CMAKE_ARGS} -D${CACHE_VAR}${CACHE_VAR_TYPE}=\"${${CACHE_VAR}}\"")
+    list(APPEND CMAKE_ARGS "-D${CACHE_VAR}${CACHE_VAR_TYPE}=${${CACHE_VAR}}")
   endif()
 endforeach()
  
@@ -35,7 +35,7 @@ set(STASM4_INSTALL_DIR &quot;${CMAKE_BINARY_DIR}/stasm&quot;)
 ExternalProject_Add(external_stasm
   URL ${STASM4_SOURCE_DIR}
   PREFIX ${STASM4_PREFIX}
-  CMAKE_ARGS \"${CMAKE_ARGS}\";
+  CMAKE_ARGS "${CMAKE_ARGS};-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"
   INSTALL_DIR ${STASM4_INSTALL_DIR}
   BINARY_DIR "${STASM4_PREFIX}/lib"
   )