From 104ef8f30e8a407a94e3a18dd7e9963aac609511 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 31 Oct 2021 21:43:30 +0100 Subject: [PATCH] Move src/api/tesseractmain.cpp to src/tesseract.cpp Signed-off-by: Stefan Weil --- CMakeLists.txt | 6 +++--- Makefile.am | 2 +- configure.ac | 2 +- src/{api/tesseractmain.cpp => tesseract.cpp} | 2 +- sw.cpp | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename src/{api/tesseractmain.cpp => tesseract.cpp} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6717bf8427..af8a8acbbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -362,7 +362,7 @@ else() include_directories(${Leptonica_INCLUDE_DIRS}) # Check for optional libraries. - find_package(TIFF) # for tesseractmain + find_package(TIFF) # for tesseract if(NOT TIFF_FOUND AND PKG_CONFIG_EXECUTABLE) # try PKG_CONFIG to find libtiff if cmake failed pkg_check_modules(TIFF libtiff-4) @@ -733,10 +733,10 @@ if (WIN32 AND CLANG AND OPENMP_BUILD) endif() ######################################## -# EXECUTABLE tesseractmain +# EXECUTABLE tesseract ######################################## -add_executable (tesseract src/api/tesseractmain.cpp) +add_executable (tesseract src/tesseract.cpp) target_link_libraries (tesseract libtesseract) if (HAVE_TIFFIO_H AND WIN32) target_link_libraries (tesseract ${TIFF_LIBRARIES}) diff --git a/Makefile.am b/Makefile.am index d31d40619f..b5cb508398 100644 --- a/Makefile.am +++ b/Makefile.am @@ -718,7 +718,7 @@ endif # Rules for tesseract executable. bin_PROGRAMS = tesseract -tesseract_SOURCES = src/api/tesseractmain.cpp +tesseract_SOURCES = src/tesseract.cpp tesseract_CPPFLAGS = tesseract_CPPFLAGS += -I$(top_srcdir)/src/arch tesseract_CPPFLAGS += -I$(top_srcdir)/src/ccstruct diff --git a/configure.ac b/configure.ac index 8a2ca8924c..e807b62b95 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_LANG_COMPILER_REQUIRE CXXFLAGS=${CXXFLAGS:-""} AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([config]) -AC_CONFIG_SRCDIR([src/api/tesseractmain.cpp]) +AC_CONFIG_SRCDIR([src/tesseract.cpp]) AC_PREFIX_DEFAULT([/usr/local]) # Automake configuration. Do not require README file (we use README.md). diff --git a/src/api/tesseractmain.cpp b/src/tesseract.cpp similarity index 99% rename from src/api/tesseractmain.cpp rename to src/tesseract.cpp index 2dad399966..fbbddb87d4 100644 --- a/src/api/tesseractmain.cpp +++ b/src/tesseract.cpp @@ -1,5 +1,5 @@ /********************************************************************** - * File: tesseractmain.cpp + * File: tesseract.cpp * Description: Main program for merge of tess and editor. * Author: Ray Smith * diff --git a/sw.cpp b/sw.cpp index 3371b8d301..7e6876615e 100644 --- a/sw.cpp +++ b/sw.cpp @@ -20,7 +20,7 @@ void build(Solution &s) libtesseract -= "src/training/.*"_rr; libtesseract -= - "src/api/tesseractmain.cpp", + "src/tesseract.cpp", "src/viewer/svpaint.cpp"; libtesseract.Public += "include"_idir; @@ -109,7 +109,7 @@ void build(Solution &s) auto &tesseract = tess.addExecutable("tesseract"); { tesseract += cppstd; - tesseract += "src/api/tesseractmain.cpp"; + tesseract += "src/tesseract.cpp"; tesseract += libtesseract; }