diff options
| -rw-r--r-- | cmake/FindGLESv2.cmake | 3 | ||||
| -rw-r--r-- | cmake/FindWrapOpenGL.cmake | 4 | ||||
| -rw-r--r-- | cmake/QtGenerateLibPri.cmake | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/cmake/FindGLESv2.cmake b/cmake/FindGLESv2.cmake index 3ba7b85d68..e934170196 100644 --- a/cmake/FindGLESv2.cmake +++ b/cmake/FindGLESv2.cmake @@ -60,8 +60,7 @@ if(GLESv2_FOUND AND NOT TARGET GLESv2::GLESv2) # For simulator_and_device builds we can't specify the full library path, because # it's specific to either the device or the simulator. Resort to passing a link # flag instead. - set_target_properties(GLESv2::GLESv2 PROPERTIES - INTERFACE_LINK_LIBRARIES "-framework OpenGLES") + target_link_libraries(GLESv2::GLESv2 INTERFACE "-framework OpenGLES") endif() else() add_library(GLESv2::GLESv2 UNKNOWN IMPORTED) diff --git a/cmake/FindWrapOpenGL.cmake b/cmake/FindWrapOpenGL.cmake index fa2acc746b..91d8b77c12 100644 --- a/cmake/FindWrapOpenGL.cmake +++ b/cmake/FindWrapOpenGL.cmake @@ -27,7 +27,7 @@ if (OpenGL_FOUND) if(NOT __opengl_fw_path) # Just a safety measure in case if no OpenGL::GL target exists. - set(__opengl_fw_path "-framework" "OpenGL") + set(__opengl_fw_path "-framework OpenGL") endif() find_library(WrapOpenGL_AGL NAMES AGL) @@ -35,7 +35,7 @@ if (OpenGL_FOUND) set(__opengl_agl_fw_path "${WrapOpenGL_AGL}") endif() if(NOT __opengl_agl_fw_path) - set(__opengl_agl_fw_path "-framework" "AGL") + set(__opengl_agl_fw_path "-framework AGL") endif() target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_fw_path}) diff --git a/cmake/QtGenerateLibPri.cmake b/cmake/QtGenerateLibPri.cmake index c7d6201e84..0e62536a1a 100644 --- a/cmake/QtGenerateLibPri.cmake +++ b/cmake/QtGenerateLibPri.cmake @@ -23,7 +23,7 @@ function(qmake_list out_var) # Surround values that contain spaces with double quotes. foreach(v ${ARGN}) - if(v MATCHES " ") + if(v MATCHES " " AND NOT MATCHES "^-framework") set(v "\"${v}\"") endif() list(APPEND result ${v}) |