diff options
Diffstat (limited to 'Modules/FindGLUT.cmake')
| -rw-r--r-- | Modules/FindGLUT.cmake | 55 |
1 files changed, 18 insertions, 37 deletions
diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index 09403bc..613d315 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -107,18 +107,8 @@ elseif(APPLE) if(GLUT_cocoa_LIBRARY AND NOT TARGET GLUT::Cocoa) 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}") - else() - set_target_properties(GLUT::Cocoa PROPERTIES - IMPORTED_LOCATION "${GLUT_cocoa_LIBRARY}") - endif() + set_target_properties(GLUT::Cocoa PROPERTIES + IMPORTED_LOCATION "${GLUT_cocoa_LIBRARY}") endif() else() if(BEOS) @@ -196,32 +186,23 @@ if (GLUT_FOUND) add_library(GLUT::GLUT UNKNOWN IMPORTED) set_target_properties(GLUT::GLUT PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${GLUT_INCLUDE_DIRS}") - 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() + if(GLUT_glut_LIBRARY_RELEASE) + set_property(TARGET GLUT::GLUT APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(GLUT::GLUT PROPERTIES + IMPORTED_LOCATION_RELEASE "${GLUT_glut_LIBRARY_RELEASE}") + endif() + + if(GLUT_glut_LIBRARY_DEBUG) + set_property(TARGET GLUT::GLUT APPEND PROPERTY + IMPORTED_CONFIGURATIONS DEBUG) set_target_properties(GLUT::GLUT PROPERTIES - IMPORTED_LOCATION "${_glut_glut}") - else() - if(GLUT_glut_LIBRARY_RELEASE) - set_property(TARGET GLUT::GLUT APPEND PROPERTY - IMPORTED_CONFIGURATIONS RELEASE) - set_target_properties(GLUT::GLUT PROPERTIES - IMPORTED_LOCATION_RELEASE "${GLUT_glut_LIBRARY_RELEASE}") - endif() - - if(GLUT_glut_LIBRARY_DEBUG) - set_property(TARGET GLUT::GLUT APPEND PROPERTY - IMPORTED_CONFIGURATIONS DEBUG) - set_target_properties(GLUT::GLUT PROPERTIES - IMPORTED_LOCATION_DEBUG "${GLUT_glut_LIBRARY_DEBUG}") - endif() - - if(NOT GLUT_glut_LIBRARY_RELEASE AND NOT GLUT_glut_LIBRARY_DEBUG) - set_property(TARGET GLUT::GLUT APPEND PROPERTY - IMPORTED_LOCATION "${GLUT_glut_LIBRARY}") - endif() + IMPORTED_LOCATION_DEBUG "${GLUT_glut_LIBRARY_DEBUG}") + endif() + + if(NOT GLUT_glut_LIBRARY_RELEASE AND NOT GLUT_glut_LIBRARY_DEBUG) + set_property(TARGET GLUT::GLUT APPEND PROPERTY + IMPORTED_LOCATION "${GLUT_glut_LIBRARY}") endif() if(TARGET GLUT::Xmu) |