Skip to content
Snippets Groups Projects
Commit ac88d58f authored by callum_linden's avatar callum_linden
Browse files

Changes to let CMake generate determine where the build files for OS X CEF media plugin are

parent aebc5a49
Branches
Tags
No related merge requests found
...@@ -6,7 +6,7 @@ if (USESYSTEMLIBS) ...@@ -6,7 +6,7 @@ if (USESYSTEMLIBS)
set(CEFPLUGIN OFF CACHE BOOL set(CEFPLUGIN OFF CACHE BOOL
"CEFPLUGIN support for the llplugin/llmedia test apps.") "CEFPLUGIN support for the llplugin/llmedia test apps.")
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(cef) use_prebuilt_binary(llceflib)
set(CEFPLUGIN ON CACHE BOOL set(CEFPLUGIN ON CACHE BOOL
"CEFPLUGIN support for the llplugin/llmedia test apps.") "CEFPLUGIN support for the llplugin/llmedia test apps.")
set(CEF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/cef) set(CEF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/cef)
...@@ -19,11 +19,22 @@ if (WINDOWS) ...@@ -19,11 +19,22 @@ if (WINDOWS)
llceflib.lib llceflib.lib
) )
elseif (DARWIN) elseif (DARWIN)
FIND_LIBRARY(APPKIT_LIBRARY AppKit)
if (NOT APPKIT_LIBRARY)
message(FATAL_ERROR "AppKit not found")
endif()
FIND_LIBRARY(CEF_LIBRARY "Chromium Embedded Framework" ${ARCH_PREBUILT_DIRS_RELEASE})
if (NOT CEF_LIBRARY)
message(FATAL_ERROR "CEF not found")
endif()
set(CEF_PLUGIN_LIBRARIES set(CEF_PLUGIN_LIBRARIES
${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a ${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a
${ARCH_PREBUILT_DIRS_RELEASE}/libLLCefLib.a ${ARCH_PREBUILT_DIRS_RELEASE}/libLLCefLib.a
${APPKIT_LIBRARY}
#${ARCH_PREBUILT_DIRS_RELEASE}/libQtWebKit.4.dylib ${CEF_LIBRARY}
) )
elseif (LINUX) elseif (LINUX)
endif (WINDOWS) endif (WINDOWS)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment