From d2bee35fa9e3e9ad5696fd3b159356e1129d74e4 Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Sun, 18 May 2014 12:49:09 -0500 Subject: [PATCH] Moved tinythread out of openalpr main and into the support library --- src/openalpr/CMakeLists.txt | 1 - src/openalpr/alpr_impl.h | 2 +- src/openalpr/support/CMakeLists.txt | 1 + src/openalpr/{tinythread => support}/fast_mutex.h | 0 src/openalpr/{tinythread => support}/tinythread.cpp | 0 src/openalpr/{tinythread => support}/tinythread.h | 0 6 files changed, 2 insertions(+), 2 deletions(-) rename src/openalpr/{tinythread => support}/fast_mutex.h (100%) rename src/openalpr/{tinythread => support}/tinythread.cpp (100%) rename src/openalpr/{tinythread => support}/tinythread.h (100%) diff --git a/src/openalpr/CMakeLists.txt b/src/openalpr/CMakeLists.txt index 82bb7ab..9046926 100644 --- a/src/openalpr/CMakeLists.txt +++ b/src/openalpr/CMakeLists.txt @@ -23,7 +23,6 @@ set(lpr_source_files verticalhistogram.cpp trex.c cjson.c - tinythread/tinythread.cpp ) diff --git a/src/openalpr/alpr_impl.h b/src/openalpr/alpr_impl.h index 6db7fc6..2c8665d 100644 --- a/src/openalpr/alpr_impl.h +++ b/src/openalpr/alpr_impl.h @@ -40,7 +40,7 @@ #include -#include "tinythread/tinythread.h" +#include "support/tinythread.h" #define DEFAULT_TOPN 25 #define DEFAULT_DETECT_REGION false diff --git a/src/openalpr/support/CMakeLists.txt b/src/openalpr/support/CMakeLists.txt index 5516c67..9b72a47 100644 --- a/src/openalpr/support/CMakeLists.txt +++ b/src/openalpr/support/CMakeLists.txt @@ -3,6 +3,7 @@ set(support_source_files filesystem.cpp timing.cpp + tinythread.cpp ) add_library(support STATIC ${support_source_files}) diff --git a/src/openalpr/tinythread/fast_mutex.h b/src/openalpr/support/fast_mutex.h similarity index 100% rename from src/openalpr/tinythread/fast_mutex.h rename to src/openalpr/support/fast_mutex.h diff --git a/src/openalpr/tinythread/tinythread.cpp b/src/openalpr/support/tinythread.cpp similarity index 100% rename from src/openalpr/tinythread/tinythread.cpp rename to src/openalpr/support/tinythread.cpp diff --git a/src/openalpr/tinythread/tinythread.h b/src/openalpr/support/tinythread.h similarity index 100% rename from src/openalpr/tinythread/tinythread.h rename to src/openalpr/support/tinythread.h