From 058266d745d3db63d04046a3ee17aa567def612a Mon Sep 17 00:00:00 2001
From: Scott Klum <scott.klum@gmail.com>
Date: Thu, 18 Sep 2014 10:50:03 -0400
Subject: [PATCH] Fixed some windows related issues, not including tasm in compilation yet

---
 3rdparty/stasm/stasm/CMakeLists.txt      | 2 +-
 3rdparty/stasm/stasm/stasm/src/err.cpp   | 2 ++
 3rdparty/stasm/stasm/stasm/src/print.cpp | 1 +
 share/openbr/cmake/FindStasm4.cmake      | 3 +--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/3rdparty/stasm/stasm/CMakeLists.txt b/3rdparty/stasm/stasm/CMakeLists.txt
index b2cdca4..3ed3f8d 100644
--- a/3rdparty/stasm/stasm/CMakeLists.txt
+++ b/3rdparty/stasm/stasm/CMakeLists.txt
@@ -19,6 +19,6 @@ set_target_properties(stasm PROPERTIES
 target_link_libraries(stasm ${OpenCV_LIBS} ${Qt5Core_QTMAIN_LIBRARIES})
 
 install(DIRECTORY stasm/include/ DESTINATION include/stasm)
-install(DIRECTORY tasm/include/ DESTINATION include/tasm)
+#install(DIRECTORY tasm/include/ DESTINATION include/tasm)
 
 install(TARGETS stasm RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
diff --git a/3rdparty/stasm/stasm/stasm/src/err.cpp b/3rdparty/stasm/stasm/stasm/src/err.cpp
index 29a93e2..fc0621f 100755
--- a/3rdparty/stasm/stasm/stasm/src/err.cpp
+++ b/3rdparty/stasm/stasm/stasm/src/err.cpp
@@ -28,6 +28,8 @@
 #include "err.h"
 #include "misc.h"
 
+#include <stdarg.h>
+
 namespace stasm
 {
 static char err_g[SBIG]; // err msg saved for retrieval by LastErr and stasm_lasterr
diff --git a/3rdparty/stasm/stasm/stasm/src/print.cpp b/3rdparty/stasm/stasm/stasm/src/print.cpp
index bfa3db7..478090c 100755
--- a/3rdparty/stasm/stasm/stasm/src/print.cpp
+++ b/3rdparty/stasm/stasm/stasm/src/print.cpp
@@ -7,6 +7,7 @@
 #include "misc.h"
 
 #include <sys/stat.h>
+#include <stdarg.h>
 
 namespace stasm
 {
diff --git a/share/openbr/cmake/FindStasm4.cmake b/share/openbr/cmake/FindStasm4.cmake
index 60b3f7a..f44fdb3 100644
--- a/share/openbr/cmake/FindStasm4.cmake
+++ b/share/openbr/cmake/FindStasm4.cmake
@@ -22,14 +22,13 @@ foreach(CACHE_VAR ${CACHE_VARS})
     else()
       set(CACHE_VAR_TYPE :${CACHE_VAR_TYPE})
     endif()
-
 	if(CACHE_VAR STREQUAL "CMAKE_PREFIX_PATH")
 		set(CMAKE_PREFIX_PATH "\"${${CACHE_VAR}}\"")
 	endif()
   endif()
 endforeach()
 
-find_path(STASM4_SOURCE_DIR stasm/include/stasm_lib.h ${CMAKE_SOURCE_DIR}/3rdparty/*)
+find_path(STASM4_SOURCE_DIR stasm/stasm/include/stasm_lib.h ${CMAKE_SOURCE_DIR}/3rdparty/*)
 
 set(STASM4_PREFIX "${CMAKE_BINARY_DIR}/stasm")
 set(STASM4_INSTALL_DIR "${CMAKE_BINARY_DIR}/stasm")
--
libgit2 0.21.4