From 83f7b97f9ecb145f468cdbc775baaa4a5612e80e Mon Sep 17 00:00:00 2001 From: Micooz Date: Wed, 18 Mar 2015 18:50:41 +0800 Subject: [PATCH] Fix compile bug in Linux. --- CMakeLists.txt | 44 +++++++++++++++++++++----------------------- src/util/util.cpp | 5 +---- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d91787..b0f5627 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8) project (EasyPR) @@ -8,31 +8,29 @@ find_package(OpenCV REQUIRED) set(CMAKE_SOURCE_DIR ./src) -include_directories(${CMAKE_SOURCE_DIR}/include/) - set(SOURCE_FILES - src/main.cpp + src/main.cpp src/core/core_func.cpp - src/core/chars_identify.cpp - src/core/chars_recognise.cpp - src/core/chars_segment.cpp - src/core/features.cpp + src/core/chars_identify.cpp + src/core/chars_recognise.cpp + src/core/chars_segment.cpp + src/core/features.cpp src/core/plate.cpp - src/core/plate_detect.cpp - src/core/plate_judge.cpp - src/core/plate_locate.cpp - src/core/plate_recognize.cpp - src/test/accuracy_test.cpp - src/test/test.cpp - src/train/ann_train.cpp - src/train/svm_train.cpp - src/util/deface.cpp - src/util/general_test_prepare.cpp - src/util/generate_gdts.cpp - src/util/learn_prepare.cpp - src/util/mc_data_prepare.cpp - src/util/util.cpp - src/util/CParser.cpp + src/core/plate_detect.cpp + src/core/plate_judge.cpp + src/core/plate_locate.cpp + src/core/plate_recognize.cpp + src/test/accuracy_test.cpp + src/test/test.cpp + src/train/ann_train.cpp + src/train/svm_train.cpp + src/util/deface.cpp + src/util/general_test_prepare.cpp + src/util/generate_gdts.cpp + src/util/learn_prepare.cpp + src/util/mc_data_prepare.cpp + src/util/util.cpp + src/util/CParser.cpp ) add_executable(EasyPR ${SOURCE_FILES}) diff --git a/src/util/util.cpp b/src/util/util.cpp index 122b68d..81b3297 100644 --- a/src/util/util.cpp +++ b/src/util/util.cpp @@ -5,11 +5,8 @@ #include #include #elif defined(linux) || defined(__linux__) -//#include -//#include -//#include +#include #include -#include #include #elif defined(__APPLE__) #include