mirror of
https://github.com/kerberos-io/openalpr-base.git
synced 2025-10-07 10:30:52 +08:00
Merge branch 'multithread' into develop
Conflicts: src/misc_utilities/CMakeLists.txt src/openalpr/CMakeLists.txt src/openalpr/alpr_impl.cpp src/openalpr/alpr_impl.h src/openalpr/config.cpp src/openalpr/config.h
This commit is contained in:
@@ -23,9 +23,10 @@ set(lpr_source_files
|
||||
verticalhistogram.cpp
|
||||
trex.c
|
||||
cjson.c
|
||||
tinythread/tinythread.cpp
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
add_subdirectory(simpleini)
|
||||
add_subdirectory(support)
|
||||
@@ -35,4 +36,4 @@ add_library(openalpr ${lpr_source_files})
|
||||
|
||||
|
||||
# Add definition for default runtime dir
|
||||
add_definitions(-DDEFAULT_RUNTIME_DIR="${CMAKE_SOURCE_DIR}/../runtime_data/")
|
||||
add_definitions(-DDEFAULT_RUNTIME_DIR="${CMAKE_SOURCE_DIR}/../runtime_data/")
|
Reference in New Issue
Block a user