diff options
| author | Brad King <brad.king@kitware.com> | 2023-08-25 15:00:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-08-25 15:05:18 (GMT) |
| commit | 6b01a27f901b5eb392955fea322cde44a1b782a3 (patch) | |
| tree | 331d6031910ec79cd0bb22e7ced9ea37b505e805 /Modules/FindOpenGL.cmake | |
| parent | 5ae0030e90df07e56dc16b0210bd334650dcc9d4 (diff) | |
| download | CMake-6b01a27f901b5eb392955fea322cde44a1b782a3.zip CMake-6b01a27f901b5eb392955fea322cde44a1b782a3.tar.gz CMake-6b01a27f901b5eb392955fea322cde44a1b782a3.tar.bz2 | |
macOS: Simplify imported framework locations in find modules
Take advantage of commit d605f728f7 (macOS: Allow IMPORTED_LOCATION to
be a framework folder, 2023-06-16) to remove special-case framework
logic from find modules.
This changes link lines from `/path/to/Foo.framework/Foo[.tbd]` to
`-framework Foo`. With the latter, the linker will automatically choose
the `.tbd` if it exists.
Issue: #24946
Diffstat (limited to 'Modules/FindOpenGL.cmake')
| -rw-r--r-- | Modules/FindOpenGL.cmake | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index 843f787..1527c31 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -655,17 +655,8 @@ if(OPENGL_FOUND) # A legacy GL library is available, so use it for the legacy GL target. if(IS_ABSOLUTE "${OPENGL_gl_LIBRARY}") add_library(OpenGL::GL UNKNOWN IMPORTED) - if(OPENGL_gl_LIBRARY MATCHES "/([^/]+)\\.framework$") - set(_gl_fw "${OPENGL_gl_LIBRARY}/${CMAKE_MATCH_1}") - if(EXISTS "${_gl_fw}.tbd") - string(APPEND _gl_fw ".tbd") - endif() - set_target_properties(OpenGL::GL PROPERTIES - IMPORTED_LOCATION "${_gl_fw}") - else() - set_target_properties(OpenGL::GL PROPERTIES - IMPORTED_LOCATION "${OPENGL_gl_LIBRARY}") - endif() + set_target_properties(OpenGL::GL PROPERTIES + IMPORTED_LOCATION "${OPENGL_gl_LIBRARY}") else() add_library(OpenGL::GL INTERFACE IMPORTED) set_target_properties(OpenGL::GL PROPERTIES @@ -709,17 +700,8 @@ if(OPENGL_FOUND) if(OPENGL_GLU_FOUND AND NOT TARGET OpenGL::GLU) if(IS_ABSOLUTE "${OPENGL_glu_LIBRARY}") add_library(OpenGL::GLU UNKNOWN IMPORTED) - if(OPENGL_glu_LIBRARY MATCHES "/([^/]+)\\.framework$") - set(_glu_fw "${OPENGL_glu_LIBRARY}/${CMAKE_MATCH_1}") - if(EXISTS "${_glu_fw}.tbd") - string(APPEND _glu_fw ".tbd") - endif() - set_target_properties(OpenGL::GLU PROPERTIES - IMPORTED_LOCATION "${_glu_fw}") - else() - set_target_properties(OpenGL::GLU PROPERTIES - IMPORTED_LOCATION "${OPENGL_glu_LIBRARY}") - endif() + set_target_properties(OpenGL::GLU PROPERTIES + IMPORTED_LOCATION "${OPENGL_glu_LIBRARY}") else() add_library(OpenGL::GLU INTERFACE IMPORTED) set_target_properties(OpenGL::GLU PROPERTIES |