From 21acb7084a29a9f542b632d1d5d9f5f0c94acf2d Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Thu, 20 Feb 2014 17:32:50 -0600 Subject: [PATCH] Compiling tinythread as part of the openalpr source (rather than a separate library) --- src/misc_utilities/CMakeLists.txt | 2 -- src/openalpr/CMakeLists.txt | 2 +- src/openalpr/tinythread/CMakeLists.txt | 6 ------ 3 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 src/openalpr/tinythread/CMakeLists.txt diff --git a/src/misc_utilities/CMakeLists.txt b/src/misc_utilities/CMakeLists.txt index fd675f9..d9ac3a7 100644 --- a/src/misc_utilities/CMakeLists.txt +++ b/src/misc_utilities/CMakeLists.txt @@ -24,7 +24,6 @@ ADD_EXECUTABLE( benchmark benchmark.cpp ) TARGET_LINK_LIBRARIES(benchmark openalpr support - tinythread ${OpenCV_LIBS} tesseract ) @@ -42,7 +41,6 @@ ADD_EXECUTABLE( findnegatives findnegatives.cpp ) TARGET_LINK_LIBRARIES(findnegatives openalpr support - tinythread ${OpenCV_LIBS} tesseract ) \ No newline at end of file diff --git a/src/openalpr/CMakeLists.txt b/src/openalpr/CMakeLists.txt index 6a27d58..3cc4923 100644 --- a/src/openalpr/CMakeLists.txt +++ b/src/openalpr/CMakeLists.txt @@ -23,13 +23,13 @@ set(lpr_source_files verticalhistogram.cpp trex.c cjson.c + tinythread/tinythread.cpp ) add_subdirectory(simpleini) add_subdirectory(support) -add_subdirectory(tinythread) add_library(openalpr ${lpr_source_files}) \ No newline at end of file diff --git a/src/openalpr/tinythread/CMakeLists.txt b/src/openalpr/tinythread/CMakeLists.txt deleted file mode 100644 index 435c2de..0000000 --- a/src/openalpr/tinythread/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -set(tinythread_source_files - tinythread.cpp -) - - -add_library(tinythread ${tinythread_source_files}) \ No newline at end of file