Merge branch 'main' of https://github.com/tesseract-ocr/tesseract

.github/workflows/cmake.yml

@@ -14,11 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         config:
-
-          - { name: macos-12-clang-14-cmake, os: macos-12, cxx: clang++ } # default
-          - { name: macos-14-clang-15-cmake, os: macos-14, cxx: clang++ } # default
-
+          - { name: macos-14-clang-15-cmake, os: macos-14, cxx: clang++ } # default        
           - { name: macos-14-gcc-14-cmake, os: macos-14, cxx: g++-14 } #installed
+          - { name: macos-15-clang-cmake, os: macos-15, cxx: clang++ } # default
 
           - { name: ubuntu-22.04-clang-15-cmake, os: ubuntu-22.04, cxx: clang++-15 } #installed
 
@@ -55,6 +53,8 @@ jobs:
            brew install ninja
            ninja --version
            cmake --version
+           clang++ --version
+           g++ --version
         if: runner.os == 'macOS'
 
       - name: Checkout Source

src/training/CMakeLists.txt

@@ -126,7 +126,7 @@ install(
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 generate_export_header(common_training EXPORT_MACRO_NAME
                        TESS_COMMON_TRAINING_API)
-if (MSVC)
+if (MSVC AND BUILD_SHARED_LIBS)
   install(FILES $<TARGET_PDB_FILE:common_training> DESTINATION bin OPTIONAL)
 endif()
 project_group(common_training "Training Tools")
@@ -298,7 +298,7 @@ if(ICU_FOUND)
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-  if (MSVC)
+  if (MSVC AND BUILD_SHARED_LIBS)
     install(FILES $<TARGET_PDB_FILE:unicharset_training> DESTINATION bin OPTIONAL)
   endif()
   generate_export_header(unicharset_training EXPORT_MACRO_NAME