diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-14 12:10:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-14 12:11:07 (GMT) |
| commit | 6aff058ab4a2d54a316dbaa536572ad71efb8b51 (patch) | |
| tree | b858d5d0849516f8a14a438a1745b4ccaa7d45b6 /Modules | |
| parent | 7be4b24ae6a77df4e58fad3ccbbbb27a5575217f (diff) | |
| parent | d29d034e2e1a867bf769529b5f5f20090402f469 (diff) | |
| download | CMake-6aff058ab4a2d54a316dbaa536572ad71efb8b51.zip CMake-6aff058ab4a2d54a316dbaa536572ad71efb8b51.tar.gz CMake-6aff058ab4a2d54a316dbaa536572ad71efb8b51.tar.bz2 | |
Merge topic 'FindGLUT-macos-tbd' into release-3.19
d29d034e2e FindGLUT: Handle Mojave and Big Sur 'tbd' framework files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5601
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindGLUT.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index a22bf5b..15561d6 100644 --- a/Modules/FindGLUT.cmake +++ b/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 |