Browse Source

Merge topic 'FindGLUT-macos-tbd' into release-3.19

d29d034e2e FindGLUT: Handle Mojave and Big Sur 'tbd' framework files

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5601
Brad King 4 years ago
parent
commit
6aff058ab4
1 changed files with 10 additions and 2 deletions
  1. 10 2
      Modules/FindGLUT.cmake

+ 10 - 2
Modules/FindGLUT.cmake

@@ -64,8 +64,12 @@ else ()
       add_library(GLUT::Cocoa UNKNOWN IMPORTED)
       # Cocoa should always be a Framework, but we check to make sure.
       if(GLUT_cocoa_LIBRARY MATCHES "/([^/]+)\\.framework$")
+        set(_glut_cocoa "${GLUT_cocoa_LIBRARY}/${CMAKE_MATCH_1}")
+        if(EXISTS "${_glut_cocoa}.tbd")
+          string(APPEND _glut_cocoa ".tbd")
+        endif()
         set_target_properties(GLUT::Cocoa PROPERTIES
-          IMPORTED_LOCATION "${GLUT_cocoa_LIBRARY}/${CMAKE_MATCH_1}")
+          IMPORTED_LOCATION "${_glut_cocoa}")
       else()
         set_target_properties(GLUT::Cocoa PROPERTIES
           IMPORTED_LOCATION "${GLUT_cocoa_LIBRARY}")
@@ -146,8 +150,12 @@ if (GLUT_FOUND)
     set_target_properties(GLUT::GLUT PROPERTIES
       INTERFACE_INCLUDE_DIRECTORIES "${GLUT_INCLUDE_DIR}")
     if(GLUT_glut_LIBRARY MATCHES "/([^/]+)\\.framework$")
+      set(_glut_glut "${GLUT_glut_LIBRARY}/${CMAKE_MATCH_1}")
+      if(EXISTS "${_glut_glut}.tbd")
+        string(APPEND _glut_glut ".tbd")
+      endif()
       set_target_properties(GLUT::GLUT PROPERTIES
-        IMPORTED_LOCATION "${GLUT_glut_LIBRARY}/${CMAKE_MATCH_1}")
+        IMPORTED_LOCATION "${_glut_glut}")
     else()
       if(GLUT_glut_LIBRARY_RELEASE)
         set_property(TARGET GLUT::GLUT APPEND PROPERTY