From f251a0da39cba97681bc81ab02fb460f85a87114 Mon Sep 17 00:00:00 2001 From: zdenop Date: Tue, 11 Jun 2024 19:25:15 +0200 Subject: [PATCH] use c++17 instead of c++11 --- .github/workflows/autotools-macos.yml | 4 ++-- .github/workflows/autotools.yml | 2 +- .github/workflows/cmake.yml | 4 ++-- INSTALL.GIT.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/autotools-macos.yml b/.github/workflows/autotools-macos.yml index f53b94d7..e904d71b 100644 --- a/.github/workflows/autotools-macos.yml +++ b/.github/workflows/autotools-macos.yml @@ -93,7 +93,7 @@ jobs: run: | export "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig" cd test - ${{ matrix.config.cxx }} -o basicapitest testing/basicapitest.cpp $(pkg-config --cflags --libs tesseract lept) -pthread -std=c++11 -framework accelerate + ${{ matrix.config.cxx }} -o basicapitest testing/basicapitest.cpp $(pkg-config --cflags --libs tesseract lept) -pthread -std=c++17 -framework accelerate ./basicapitest - name: Display Compiler Version @@ -193,7 +193,7 @@ jobs: run: | export "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig" cd test - ${{ matrix.config.cxx }} -o basicapitest testing/basicapitest.cpp -I/opt/local/include -L/opt/local/lib $(pkg-config --cflags --libs tesseract lept) -pthread -std=c++11 -framework Accelerate + ${{ matrix.config.cxx }} -o basicapitest testing/basicapitest.cpp -I/opt/local/include -L/opt/local/lib $(pkg-config --cflags --libs tesseract lept) -pthread -std=c++17 -framework Accelerate ./basicapitest - name: Display Compiler Version diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml index 1a79a17f..dde84678 100644 --- a/.github/workflows/autotools.yml +++ b/.github/workflows/autotools.yml @@ -92,7 +92,7 @@ jobs: run: | export "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig" cd test - ${{ matrix.config.cxx }} -o basicapitest testing/basicapitest.cpp -I/usr/local/include -L/usr/local/lib `pkg-config --cflags --libs tesseract lept ` -pthread -std=c++11 + ${{ matrix.config.cxx }} -o basicapitest testing/basicapitest.cpp -I/usr/local/include -L/usr/local/lib `pkg-config --cflags --libs tesseract lept ` -pthread -std=c++17 ./basicapitest - name: Setup for Tesseract benchmark using image from issue 263 fifteen times in a list file diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 0d797cf9..de0af278 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -133,7 +133,7 @@ jobs: run: | export "PKG_CONFIG_PATH=$GITHUB_WORKSPACE/build/inst/lib/pkgconfig/:$PKG_CONFIG_PATH" cd test - ${{ matrix.config.cxx }} -o basicapitest testing/basicapitest.cpp "-I$GITHUB_WORKSPACE/build/inst/include" "-L$GITHUB_WORKSPACE/build/inst/lib" $(pkg-config --cflags --libs tesseract lept libarchive libcurl) -pthread -std=c++11 + ${{ matrix.config.cxx }} -o basicapitest testing/basicapitest.cpp "-I$GITHUB_WORKSPACE/build/inst/include" "-L$GITHUB_WORKSPACE/build/inst/lib" $(pkg-config --cflags --libs tesseract lept libarchive libcurl) -pthread -std=c++17 ./basicapitest if: runner.os == 'Linux' @@ -141,7 +141,7 @@ jobs: run: | export "PKG_CONFIG_PATH=$GITHUB_WORKSPACE/build/inst/lib/pkgconfig/:$(brew --prefix)/opt/libarchive/lib/pkgconfig:$(brew --prefix)/Library/Homebrew/os/mac/pkgconfig/11:$PKG_CONFIG_PATH" cd test - ${{ matrix.config.cxx }} -o basicapitest testing/basicapitest.cpp "-I$GITHUB_WORKSPACE/build/inst/include" "-L$GITHUB_WORKSPACE/build/inst/lib" $(pkg-config --cflags --libs tesseract lept libcurl) -pthread -std=c++11 + ${{ matrix.config.cxx }} -o basicapitest testing/basicapitest.cpp "-I$GITHUB_WORKSPACE/build/inst/include" "-L$GITHUB_WORKSPACE/build/inst/lib" $(pkg-config --cflags --libs tesseract lept libcurl) -pthread -std=c++17 ./basicapitest if: runner.os == 'macOS' diff --git a/INSTALL.GIT.md b/INSTALL.GIT.md index 25f38736..37a8e0aa 100644 --- a/INSTALL.GIT.md +++ b/INSTALL.GIT.md @@ -10,7 +10,7 @@ You need Leptonica 1.74.2 (minimum) for Tesseract 4.0x. Known dependencies for training tools (excluding leptonica): -* compiler with c++11 support +* compiler with c++17 support * automake * pkg-config * pango-devel