Update openslide on linux and mac

Author: smistad

.github/workflows/CI-mac-arm64.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Install dependencies
       run: |
         brew reinstall zlib
-        brew install openslide pcre libomp
+        brew install libomp
         # Install a specific version of libomp (14.0.6) since newer versions fail with cmake
         #curl https://raw.githubusercontent.com/Homebrew/homebrew-core/c87d6a0c8360c4684e3375ce6c4576214acdd71b/Formula/libomp.rb > $(find $(brew --repository) -name libomp.rb) && brew reinstall libomp
     
@@ -131,7 +131,7 @@ jobs:
       - name: Install dependencies
         run: |
           brew reinstall zlib
-          brew install openslide pcre libomp
+          brew install libomp
            # OpenCL on apple silicon only supports GPU which 
            # the GitHub nodes don't have, thus we install pocl 
            # which supports CPUs

.github/workflows/CI-mac-x86_64.yml

@@ -23,7 +23,7 @@ jobs:
       run: |
         brew reinstall zlib
         brew reinstall libtiff
-        brew install openslide pcre libomp
+        brew install libomp
         # Install a specific version of libomp (14.0.6) since newer versions fail with cmake
         #curl https://raw.githubusercontent.com/Homebrew/homebrew-core/c87d6a0c8360c4684e3375ce6c4576214acdd71b/Formula/libomp.rb > $(find $(brew --repository) -name libomp.rb) && brew reinstall libomp
     
@@ -128,7 +128,7 @@ jobs:
         run: |
           brew reinstall zlib
           brew reinstall libtiff
-          brew install openslide pcre libomp
+          brew install libomp
       - name: Download wheel artifact
         uses: actions/download-artifact@v4
         with:
@@ -167,7 +167,7 @@ jobs:
         run: |
           brew reinstall zlib
           brew reinstall libtiff
-          brew install openslide pcre libomp
+          brew install libomp
       - name: Download wheel artifact
         uses: actions/download-artifact@v4
         with:

cmake/ExternalOpenSlide.cmake

@@ -7,11 +7,22 @@ if(WIN32)
 ExternalProject_Add(openslide
         PREFIX ${FAST_EXTERNAL_BUILD_DIR}/openslide
         BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/openslide
-        URL "https://github.com/openslide/openslide-bin/releases/download/v20231011/openslide-win64-20231011.zip"
+        URL "https://github.com/openslide/openslide-bin/releases/download/v4.0.0.8/openslide-bin-4.0.0.8-windows-x64.zip"
         CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/openslide/src/openslide/ ${FAST_EXTERNAL_INSTALL_DIR}
         BUILD_COMMAND ""
         INSTALL_COMMAND ""
 )
 
+list(APPEND FAST_EXTERNAL_DEPENDENCIES openslide)
+elseif(APPLE)
+
+ExternalProject_Add(openslide
+        PREFIX ${FAST_EXTERNAL_BUILD_DIR}/openslide
+        BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/openslide
+        URL "https://github.com/openslide/openslide-bin/releases/download/v4.0.0.8/openslide-bin-4.0.0.8-macos-arm64-x86_64.tar.xz"
+        CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy_directory ${FAST_EXTERNAL_BUILD_DIR}/openslide/src/openslide/ ${FAST_EXTERNAL_INSTALL_DIR}
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+)
 list(APPEND FAST_EXTERNAL_DEPENDENCIES openslide)
 endif()

cmake/ModuleWholeSlideImaging.cmake

@@ -12,15 +12,15 @@ if(FAST_MODULE_WholeSlideImaging)
                 tiff.lib
         )
     elseif(APPLE)
+        include(cmake/ExternalOpenSlide.cmake)
+
         set(CMAKE_FIND_FRAMEWORK LAST) # Avoid wrong TIFF header from Mono.framework being used
         # Get OpenSlide and TIFF from OS
-        find_package(OpenSlide REQUIRED)
         find_package(TIFF REQUIRED)
         find_package(JPEG REQUIRED)
 
-        list(APPEND LIBRARIES ${OPENSLIDE_LIBRARIES} ${TIFF_LIBRARIES} ${JPEG_LIBRARIES})
-        list(APPEND FAST_INCLUDE_DIRS ${OPENSLIDE_INCLUDE_DIRS} ${TIFF_INCLUDE_DIRS})
-        message(STATUS "TIFF FOUND: ${TIFF_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_INCLUDE_DIRS}")
+        list(APPEND LIBRARIES ${TIFF_LIBRARIES} ${JPEG_LIBRARIES} libopenslide.dylib)
+        list(APPEND FAST_INCLUDE_DIRS ${TIFF_INCLUDE_DIRS} ${FAST_EXTERNAL_INSTALL_DIR}/include/openslide/)
     else()
         fast_download_dependency(tiff
                 4.3.0