[cef] copy CEF locales to 'Frameworks/cef/locales' subdir

Frameworks directory already created and installed on the Mac
Reuse same name to put extra files from CEF and
do not pollute "bin/" or "lib/" directory

Author: linev

CMakeLists.txt

@@ -646,7 +646,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
   if(http)
      install(DIRECTORY js/     DESTINATION ${CMAKE_INSTALL_JSROOTDIR} ${DIR_PERMISSIONS})
   endif()
-  if(cefweb AND APPLE AND TARGET ROOTCefDisplay)
+  if(cefweb AND TARGET ROOTCefDisplay)
      install(DIRECTORY ${CMAKE_BINARY_DIR}/Frameworks/   DESTINATION ${CMAKE_INSTALL_FRAMEWORKSDIR} ${DIR_PERMISSIONS})
   endif()
   if(webgui)

gui/cefdisplay/CMakeLists.txt

@@ -35,7 +35,10 @@ elseif(MSVC)
    set(CEF_LIBRARY ${CEF_RELEASE_DIR}/libcef.lib)
    set(CEF_DLL_WRAPPER ${CEF_root}/build/libcef_dll_wrapper/Release/libcef_dll_wrapper.lib)
    file(COPY ${CEF_RELEASE_DIR}/ DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-   file(COPY ${CEF_RESOURCES}/ DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+   # copy dlls plus some extras to binary directory to let CEF find them without extra configuration
+   file(COPY ${CEF_RESOURCES}/ DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} PATTERN "locales" EXCLUDE)
+   file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Frameworks/cef/locales)
+   file(COPY ${CEF_RESOURCES}/locales/ DESTINATION ${CMAKE_BINARY_DIR}/Frameworks/cef/locales)
 else()
    set(CEF_platform src/gui_handler_linux.cxx)
    set(CEF_RESOURCES ${CEF_root}/Resources)
@@ -44,7 +47,10 @@ else()
    set(CEF_DLL_WRAPPER ${CEF_root}/build/libcef_dll_wrapper/libcef_dll_wrapper.a)
    set(CEF_LIB_DEPENDENCY ${X11_LIBRARIES})
    file(COPY ${CEF_RELEASE_DIR}/ DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-   file(COPY ${CEF_RESOURCES}/ DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+   # copy shared libraries plus some extras to library directory to let CEF find them without extra configuration
+   file(COPY ${CEF_RESOURCES}/ DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} PATTERN "locales" EXCLUDE)
+   file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Frameworks/cef/locales)
+   file(COPY ${CEF_RESOURCES}/locales/ DESTINATION ${CMAKE_BINARY_DIR}/Frameworks/cef/locales)
    if(EXISTS ${CEF_RELEASE_DIR}/swiftshader)
       file(COPY ${CEF_RELEASE_DIR}/swiftshader DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
    endif()

gui/cefdisplay/src/RCefWebDisplayHandle.cxx

@@ -206,35 +206,33 @@ std::unique_ptr<ROOT::RWebDisplayHandle> RCefWebDisplayHandle::CefCreator::Displ
    TString cef_main = TROOT::GetBinDir() + "/cef_main";
    cef_string_ascii_to_utf16(cef_main.Data(), cef_main.Length(), &settings.browser_subprocess_path);
 
-#ifdef OS_LINUX
-   // on linux resource directory copied to lib/
-   TString path2 = TROOT::GetLibDir() + "/locales";
-   cef_string_ascii_to_utf16(path2.Data(), path2.Length(), &settings.locales_dir_path);
-   TString path3 = TROOT::GetLibDir();
-   cef_string_ascii_to_utf16(path3.Data(), path3.Length(), &settings.resources_dir_path);
-#endif
-
-#ifdef OS_WIN
-   // on windows resource directory copied to bin/
-   TString path2 = TROOT::GetBinDir() + "/locales";
-   cef_string_ascii_to_utf16(path2.Data(), path2.Length(), &settings.locales_dir_path);
-   TString path3 = TROOT::GetBinDir();
-   cef_string_ascii_to_utf16(path3.Data(), path3.Length(), &settings.resources_dir_path);
-#endif
-
 #ifdef OS_MACOSX
    // on mac there is framework directory, where resources and libs are combined together
    TString path = TROOT::GetDataDir() + "/Frameworks/Chromium Embedded Framework.framework";
    cef_string_ascii_to_utf16(path.Data(), path.Length(), &settings.framework_dir_path);
 
-
+   // add CEF libraries to DYLD library path
    TString dypath = gSystem->Getenv("DYLD_LIBRARY_PATH");
    if (dypath.Length() > 0)
       dypath.Append(":");
    dypath.Append(path + "/Libraries/");
    gSystem->Setenv("DYLD_LIBRARY_PATH", dypath);
 #endif
 
+#ifdef OS_WIN
+   TString resource_dir = TROOT::GetBinDir();
+   cef_string_ascii_to_utf16(resource_dir.Data(), resource_dir.Length(), &settings.resources_dir_path);
+   TString locales_dir = TROOT::GetDataDir() + "/Frameworks/cef/locales";
+   cef_string_ascii_to_utf16(locales_dir.Data(), locales_dir.Length(), &settings.locales_dir_path);
+#endif
+
+#ifdef OS_LINUX
+   TString resource_dir = TROOT::GetLibDir();
+   cef_string_ascii_to_utf16(resource_dir.Data(), resource_dir.Length(), &settings.resources_dir_path);
+   TString locales_dir = TROOT::GetDataDir() + "/Frameworks/cef/locales";
+   cef_string_ascii_to_utf16(locales_dir.Data(), locales_dir.Length(), &settings.locales_dir_path);
+#endif
+
    settings.no_sandbox = true;
    // if (gROOT->IsWebDisplayBatch()) settings.single_process = true;