Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix OpenMP with Visual Studio #3475

Merged
merged 2 commits into from
Jun 29, 2021
Merged

Bugfix OpenMP with Visual Studio #3475

merged 2 commits into from
Jun 29, 2021

Conversation

OgreTransporter
Copy link
Contributor

As pointed out in bug #3285, tesseract cannot be built using OpenMP in conjunction with Visual Studio. Exception is the new switch /openmp:llvm of the last Visual Studio update.

This PR disables OPENMP_BUILD for older Visual Studio versions - if enabled - and replaces the switch /openmp with the new switch /openmp:llvm for Visual Studio 2019.

@egorpugin egorpugin merged commit 4d0f027 into tesseract-ocr:master Jun 29, 2021
@nocun
Copy link
Contributor

nocun commented Jun 29, 2021

This PR seemingly breaks my local CMake build (Linux):

CMake Error at CMakeLists.txt:259 (if):
  if given arguments:

    "OPENMP_BUILD" "AND" "MSVC" "AND" "LESS" "1929"

  Unknown arguments specified

All server builds seem to be passing though, do they not use CMake or is it my local issue?

Edit: ok I can see the CMake jobs run daily.

@egorpugin
Copy link
Contributor

egorpugin commented Jun 29, 2021

try "${MSVC_VERSION}"

@nocun
Copy link
Contributor

nocun commented Jun 29, 2021

try "${MSVC_VERSION}"

I think this fixes it, added PR: #3478

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants