From e8c73a7db21a1ab445b3eabd021cf842ba98ee4d Mon Sep 17 00:00:00 2001
From: Scott Klum <scott.klum@gmail.com>
Date: Tue, 26 Aug 2014 17:03:09 -0400
Subject: [PATCH] Installation working, need to clean up library paths

---
 openbr/plugins/stasm4.cmake         |  8 +++++++-
 share/openbr/cmake/FindStasm4.cmake | 25 +++++++++++++++----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/openbr/plugins/stasm4.cmake b/openbr/plugins/stasm4.cmake
index 021adc5..5f8dd7f 100644
--- a/openbr/plugins/stasm4.cmake
+++ b/openbr/plugins/stasm4.cmake
@@ -6,5 +6,11 @@ if(${BR_WITH_STASM4})
   set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/stasm4.cpp)
   set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${Stasm4_LIBS})
 
-  install(DIRECTORY ${Stasm_DIR}/data/ DESTINATION share/openbr/models/stasm)
+  if(WIN32)
+    install(FILES ${Stasm4_LIBS} DESTINATION bin)
+  else()
+    install(FILES ${Stasm4_LIBS} DESTINATION lib)
+  endif()
+
+  install(DIRECTORY ${Stasm4_DIR}/data/ DESTINATION share/openbr/models/stasm)
 endif()
diff --git a/share/openbr/cmake/FindStasm4.cmake b/share/openbr/cmake/FindStasm4.cmake
index a395c4c..01917b8 100644
--- a/share/openbr/cmake/FindStasm4.cmake
+++ b/share/openbr/cmake/FindStasm4.cmake
@@ -23,26 +23,31 @@ foreach(CACHE_VAR ${CACHE_VARS})
   endif()
 endforeach()
 
-find_path(Stasm_DIR stasm/stasm_lib.h ${CMAKE_SOURCE_DIR}/3rdparty/*)
-
-message(${CMAKE_ARGS})
+find_path(Stasm4_SOURCE_DIR stasm/include/stasm_lib.h ${CMAKE_SOURCE_DIR}/3rdparty/*)
 
 set(stasm_prefix ${CMAKE_BINARY_DIR}/stasm)
 
 # Have to use a name other than stasm so it doesn't conflict with the project itself
 ExternalProject_Add(external_stasm
-  URL ${Stasm_DIR}
+  URL ${Stasm4_SOURCE_DIR}
   PREFIX ${stasm_prefix}
   CMAKE_ARGS "-DCMAKE_PREFIX_PATH=~/Qt/5.3/clang_64/"
   INSTALL_COMMAND ""
+  BINARY_DIR "${stasm_prefix}/lib"
   )
 
-file(GLOB HEADERS "${Stasm_DIR}/stasm/*.h")
-
 ExternalProject_Add_Step(
     external_stasm
     copy_stasm_headers
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${Stasm_DIR}/stasm/include" ${stasm_prefix}/include/stasm
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${Stasm4_SOURCE_DIR}/stasm/include" ${stasm_prefix}/include/stasm
+    COMMENT "Copying stasm headers..."
+    DEPENDERS configure
+    )
+
+ExternalProject_Add_Step(
+    external_stasm
+    copy_stasm_data
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${Stasm4_SOURCE_DIR}/data" ${stasm_prefix}/data
     COMMENT "Copying stasm headers..."
     DEPENDERS configure
     )
@@ -50,8 +55,8 @@ ExternalProject_Add_Step(
 # We have to fake a library being created to force external_stasm to be built
 add_library(fake_stasm UNKNOWN IMPORTED)
 add_dependencies(fake_stasm external_stasm)
-
 ExternalProject_Get_Property(external_stasm install_dir)
-include_directories(${install_dir}/include/stasm)
 
-file(GLOB Stasm4_LIBS ${install_dir}/lib/stasm/*)
+set(Stasm4_DIR ${install_dir})
+include_directories(${install_dir}/include/stasm)
+file(GLOB Stasm4_LIBS ${install_dir}/lib/stasm/*.dylib)
--
libgit2 0.21.4