Skip to content

Commit

Permalink
Rename tesseract/tess_version.h -> tesseract/version.h
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Weil <sw@weilnetz.de>
  • Loading branch information
stweil committed Oct 29, 2019
1 parent 301704b commit 061eccd
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ config_auto.h
/doc/*.xml

# generated version file
/include/tesseract/tess_version.h
/include/tesseract/version.h

# executables
/src/api/tesseract
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@ configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY)
set(INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" "${CMAKE_INSTALL_PREFIX}/include/tesseract")

configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/include/tesseract/tess_version.h.in
${CMAKE_CURRENT_BINARY_DIR}/include/tesseract/tess_version.h @ONLY)
${CMAKE_CURRENT_SOURCE_DIR}/include/tesseract/version.h.in
${CMAKE_CURRENT_BINARY_DIR}/include/tesseract/version.h @ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/src/vs2010/tesseract/tesseract.rc.in
${CMAKE_CURRENT_BINARY_DIR}/vs2010/tesseract/tesseract.rc @ONLY)
Expand Down Expand Up @@ -532,7 +532,7 @@ install(FILES
include/tesseract/baseapi.h
include/tesseract/capi.h
include/tesseract/renderer.h
${CMAKE_CURRENT_BINARY_DIR}/include/tesseract/tess_version.h
${CMAKE_CURRENT_BINARY_DIR}/include/tesseract/version.h

#from ccmain/makefile.am
include/tesseract/thresholder.h
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ fi
# Output files
AC_CONFIG_FILES([include/tesseract/Makefile])
AC_CONFIG_FILES([include/tesseract/tess_version.h])
AC_CONFIG_FILES([include/tesseract/version.h])
AC_CONFIG_FILES([Makefile tesseract.pc])
AC_CONFIG_FILES([src/api/Makefile])
AC_CONFIG_FILES([src/arch/Makefile])
Expand Down
6 changes: 3 additions & 3 deletions cppan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ projects:
type: lib
export_all_symbols: true
files:
- src/api/tess_version.h.in
- src/api/version.h.in
- src/api/.*\.cpp
- src/arch/.*\.cpp
- src/ccmain/.*\.cpp
Expand Down Expand Up @@ -118,8 +118,8 @@ projects:
post_sources: |
configure_file(
${SDIR}/src/api/tess_version.h.in
${BDIR}/tess_version.h @ONLY)
${SDIR}/src/api/version.h.in
${BDIR}/version.h @ONLY)
if (WIN32)
if (MSVC)
set_source_files_properties(
Expand Down
2 changes: 1 addition & 1 deletion include/tesseract/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pkginclude_HEADERS = \
apitypes.h \
baseapi.h \
capi.h renderer.h \
tess_version.h
version.h

pkginclude_HEADERS += \
thresholder.h \
Expand Down
2 changes: 1 addition & 1 deletion include/tesseract/baseapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
#include "tesseract/publictypes.h"
#include "tesseract/resultiterator.h"
#include "tesseract/serialis.h"
#include "tesseract/tess_version.h"
#include "tesseract/thresholder.h"
#include "tesseract/unichar.h"
#include "tesseract/version.h"

template <typename T> class GenericVector;
class PAGE_RES;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion sw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void build(Solution &s)
libtesseract.Variables["TESSERACT_MINOR_VERSION"] = libtesseract.Variables["PACKAGE_MINOR_VERSION"];
libtesseract.Variables["TESSERACT_MICRO_VERSION"] = libtesseract.Variables["PACKAGE_PATCH_VERSION"];
libtesseract.Variables["TESSERACT_VERSION_STR"] = "master";
libtesseract.configureFile("include/tesseract/tess_version.h.in", "tesseract/tess_version.h");
libtesseract.configureFile("include/tesseract/version.h.in", "tesseract/version.h");
}

//
Expand Down

0 comments on commit 061eccd

Please sign in to comment.