diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-11-20 22:39:52 +0100 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-08-27 14:07:40 -0700 |
| commit | 1e454642c8bc99698d25105fe0034916e2930fe6 (patch) | |
| tree | 3d9b60c1366033c97dfe51d4285d6bf3edf992ed /cmake | |
| parent | fd1ed8ce48fc9eaf6793e852381d8c7e648386af (diff) | |
| download | qtlocation-mapboxgl-1e454642c8bc99698d25105fe0034916e2930fe6.tar.gz | |
[build] allow WITH_EGL for macOS as well (SwiftShader) and enable EGL for GLFW
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/mason-dependencies.cmake | 6 | ||||
| -rw-r--r-- | cmake/mbgl.cmake | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake index 826dcf2e45..4a886bef21 100644 --- a/cmake/mason-dependencies.cmake +++ b/cmake/mason-dependencies.cmake @@ -36,13 +36,17 @@ elseif(MBGL_PLATFORM STREQUAL "linux") mason_use(args VERSION 6.2.0 HEADER_ONLY) if(WITH_EGL) - mason_use(swiftshader VERSION 2017-11-20) + mason_use(swiftshader VERSION 2018-05-31) endif() elseif(MBGL_PLATFORM STREQUAL "macos") mason_use(glfw VERSION 2018-06-27-0be4f3f) mason_use(benchmark VERSION 1.4.1) mason_use(icu VERSION 58.1-min-size) mason_use(args VERSION 6.2.0 HEADER_ONLY) + + if(WITH_EGL) + mason_use(swiftshader VERSION 2018-05-31) + endif() elseif(MBGL_PLATFORM STREQUAL "qt") mason_use(optional VERSION f27e7908 HEADER_ONLY) mason_use(tao_tuple VERSION 28626e99 HEADER_ONLY) diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index fdb435ccca..da020cc93f 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -174,7 +174,7 @@ function(set_xcconfig_target_properties target) list(APPEND link_flags ${item}) endif() endforeach() - string(REPLACE ";-framework " ";-framework;" link_flags "${link_flags}") + string(REGEX REPLACE "(^|;)-framework " "\\1-framework;" link_flags "${link_flags}") string(REPLACE ";" "\" \"" link_flags "${link_flags}") set_xcode_property(${target} XCCONFIG_LINK_LIBRARIES "${link_flags}") endfunction() |