Assume pkg-config gives the leptonica subdir.

This is effectively already assumed via the configure test. Closes #76
ropensci · Oct 3, 2024 · 43b991a · 43b991a
1 parent a4a890e
commit 43b991a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -20,11 +20,12 @@ jobs:
         config:
           - {os: macos-13,        r: 'release'}
           - {os: macos-14,        r: 'release'}
-          - {os: windows-4.1 ,    r: 'release'}
           - {os: windows-latest , r: 'release'}
+          - {os: windows-latest , r: '4.1'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-latest,   r: 'release'}
-          - {os: ubuntu-latest,   r: 'oldrel-1'}
+          - {os: ubuntu-24.04,    r: 'release'}
+          - {os: ubuntu-22.04,    r: 'release'}
+          - {os: ubuntu-20.04,    r: 'release'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,5 +1,5 @@
 RWINLIB = ../windows/tesseract
-PKG_CPPFLAGS = -I${RWINLIB}/include
+PKG_CPPFLAGS = -I${RWINLIB}/include -I${RWINLIB}/include/leptonica
 
 PKG_LIBS = \
 	-L${RWINLIB}/lib${subst gcc,,${COMPILED_BY}}${R_ARCH} \

diff --git a/src/tesseract_types.h b/src/tesseract_types.h
@@ -1,5 +1,5 @@
 #include <tesseract/baseapi.h>
-#include <leptonica/allheaders.h>
+#include <allheaders.h>
 
 #define R_NO_REMAP
 #define STRICT_R_HEADERS