Skip to content

Commit

Permalink
Move src/api/tesseractmain.cpp to src/tesseract.cpp
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Weil <[email protected]>
  • Loading branch information
stweil committed Oct 31, 2021
1 parent c0b529f commit 104ef8f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion src/api/tesseractmain.cpp → src/tesseract.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**********************************************************************
* File: tesseractmain.cpp
* File: tesseract.cpp
* Description: Main program for merge of tess and editor.
* Author: Ray Smith
*
Expand Down
4 changes: 2 additions & 2 deletions sw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 104ef8f

Please sign in to comment.