diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:52:32 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:52:32 +0300 |
commit | d734105446182b17a91f6590eaa23ac690032817 (patch) | |
tree | cce54f1d1347c63100d9edef2fe942bab2f51b5e /indra/cmake/CEFPlugin.cmake | |
parent | 2f5d44f4b6e029be0593fe46151f8d25c4fa11d3 (diff) | |
parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) |
Merge branch 'master' into DRTVWR-486
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
Diffstat (limited to 'indra/cmake/CEFPlugin.cmake')
-rw-r--r-- | indra/cmake/CEFPlugin.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake index b8e569d3a8..7d8bfb1b0f 100644 --- a/indra/cmake/CEFPlugin.cmake +++ b/indra/cmake/CEFPlugin.cmake @@ -24,7 +24,7 @@ elseif (DARWIN) message(FATAL_ERROR "AppKit not found") endif() - FIND_LIBRARY(CEF_LIBRARY "Chromium Embedded Framework" ${ARCH_PREBUILT_DIRS_RELEASE}) + set(CEF_LIBRARY "'${ARCH_PREBUILT_DIRS_RELEASE}/Chromium\ Embedded\ Framework.framework'") if (NOT CEF_LIBRARY) message(FATAL_ERROR "CEF not found") endif() @@ -33,7 +33,7 @@ elseif (DARWIN) ${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a ${ARCH_PREBUILT_DIRS_RELEASE}/libdullahan.a ${APPKIT_LIBRARY} - ${CEF_LIBRARY} + "-F ${CEF_LIBRARY}" ) elseif (LINUX) |