From 338b953ca39e3f3a5a6b9156919aab21d844c98f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 16 Sep 2023 13:41:57 +0200 Subject: [PATCH] CMake: use if(var MATCHES ...) instead of if(${var} MATCHES ...). --- modules/FindEGL.cmake | 2 +- modules/FindOpenAL.cmake | 2 +- modules/FindOpenGLES2.cmake | 2 +- modules/FindOpenGLES3.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/FindEGL.cmake b/modules/FindEGL.cmake index eda9a29d1..f5391d00f 100644 --- a/modules/FindEGL.cmake +++ b/modules/FindEGL.cmake @@ -69,7 +69,7 @@ if(NOT TARGET EGL::EGL) # Work around BUGGY framework support on macOS. Do this also in case of # Emscripten, since there we don't have a location either. # http://public.kitware.com/pipermail/cmake/2016-April/063179.html - if((APPLE AND ${EGL_LIBRARY} MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN) + if((APPLE AND EGL_LIBRARY MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN) add_library(EGL::EGL INTERFACE IMPORTED) set_property(TARGET EGL::EGL APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${EGL_LIBRARY}) diff --git a/modules/FindOpenAL.cmake b/modules/FindOpenAL.cmake index 968ca4680..ecb7691f5 100644 --- a/modules/FindOpenAL.cmake +++ b/modules/FindOpenAL.cmake @@ -166,7 +166,7 @@ if(NOT TARGET OpenAL::OpenAL) # Work around BUGGY framework support on macOS. Do this also in case of # Emscripten, since there we don't have a location either. # http://public.kitware.com/pipermail/cmake/2016-April/063179.html - if((APPLE AND ${OPENAL_LIBRARY} MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN) + if((APPLE AND OPENAL_LIBRARY MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN) add_library(OpenAL::OpenAL INTERFACE IMPORTED) set_property(TARGET OpenAL::OpenAL APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${OPENAL_LIBRARY}) diff --git a/modules/FindOpenGLES2.cmake b/modules/FindOpenGLES2.cmake index e3d022c9b..ef1da66ac 100644 --- a/modules/FindOpenGLES2.cmake +++ b/modules/FindOpenGLES2.cmake @@ -64,7 +64,7 @@ if(NOT TARGET OpenGLES2::OpenGLES2) # Work around BUGGY framework support on macOS. Do this also in case of # Emscripten, since there we don't have a location either. # http://public.kitware.com/pipermail/cmake/2016-April/063179.html - if((CORRADE_TARGET_APPLE AND ${OPENGLES2_LIBRARY} MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN) + if((CORRADE_TARGET_APPLE AND OPENGLES2_LIBRARY MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN) add_library(OpenGLES2::OpenGLES2 INTERFACE IMPORTED) set_property(TARGET OpenGLES2::OpenGLES2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${OPENGLES2_LIBRARY}) diff --git a/modules/FindOpenGLES3.cmake b/modules/FindOpenGLES3.cmake index 5c41acc46..4d79aff23 100644 --- a/modules/FindOpenGLES3.cmake +++ b/modules/FindOpenGLES3.cmake @@ -69,7 +69,7 @@ if(NOT TARGET OpenGLES3::OpenGLES3) # Work around BUGGY framework support on macOS. Do this also in case of # Emscripten, since there we don't have a location either. # http://public.kitware.com/pipermail/cmake/2016-April/063179.html - if((CORRADE_TARGET_APPLE AND ${OPENGLES3_LIBRARY} MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN) + if((CORRADE_TARGET_APPLE AND OPENGLES3_LIBRARY MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN) add_library(OpenGLES3::OpenGLES3 INTERFACE IMPORTED) set_property(TARGET OpenGLES3::OpenGLES3 APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${OPENGLES3_LIBRARY})