alloy: Move warning after logging init (fixes #3713 )

cmake: Skip docs generation if the Doxyfile is missing
The Doxyfile is not included with minimal distributions.
2025-02-16 12:10:41 +01:00 · 2024-06-10 11:04:38 -04:00 · 2024-06-10 11:04:31 -04:00
3 changed files with 21 additions and 19 deletions
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@ -240,16 +240,18 @@ PRINT_CEF_CONFIG()
 # Define the API documentation target.
 #

-find_package(Doxygen)
-if(DOXYGEN_FOUND)
-  add_custom_target(apidocs ALL
-    # Generate documentation in the docs/html directory.
-    COMMAND "${DOXYGEN_EXECUTABLE}" Doxyfile
-    # Write a docs/index.html file.
-    COMMAND ${CMAKE_COMMAND} -E echo "<html><head><meta http-equiv=\"refresh\" content=\"0;URL='html/index.html'\"/></head></html>" > docs/index.html
-    WORKING_DIRECTORY "${CEF_ROOT}"
-    COMMENT "Generating API documentation with Doxygen..."
-    VERBATIM )
-else()
-  message(WARNING "Doxygen must be installed to generate API documentation.")
-endif()
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile")
+  find_package(Doxygen)
+  if(DOXYGEN_FOUND)
+    add_custom_target(apidocs ALL
+      # Generate documentation in the docs/html directory.
+      COMMAND "${DOXYGEN_EXECUTABLE}" Doxyfile
+      # Write a docs/index.html file.
+      COMMAND ${CMAKE_COMMAND} -E echo "<html><head><meta http-equiv=\"refresh\" content=\"0;URL='html/index.html'\"/></head></html>" > docs/index.html
+      WORKING_DIRECTORY "${CEF_ROOT}"
+      COMMENT "Generating API documentation with Doxygen..."
+      VERBATIM )
+  else()
+    message(WARNING "Doxygen must be installed to generate API documentation.")
+  endif()
+endif()
--- a/libcef/browser/main_runner.cc
+++ b/libcef/browser/main_runner.cc
@ -269,12 +269,6 @@ bool CefMainRunner::Initialize(CefSettings* settings,
                               void* windows_sandbox_info,
                               bool* initialized,
                               base::OnceClosure context_initialized) {
-#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
-  LOG_IF(WARNING, !settings->chrome_runtime)
-      << "Alloy bootstrap is deprecated and will be removed in ~M127. See "
-         "https://github.com/chromiumembedded/cef/issues/3685";
-#endif
-
  DCHECK(!main_delegate_);
  main_delegate_ = MakeDelegate(
 #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
--- a/libcef/common/alloy/alloy_main_delegate.cc
+++ b/libcef/common/alloy/alloy_main_delegate.cc
@ -555,6 +555,12 @@ std::optional<int> AlloyMainDelegate::BasicStartupComplete() {

  logging::InitLogging(log_settings);

+  if (is_browser) {
+    LOG(WARNING)
+        << "Alloy bootstrap is deprecated and will be removed in ~M127. See "
+           "https://github.com/chromiumembedded/cef/issues/3685";
+  }
+
  ContentSettingsPattern::SetNonWildcardDomainNonPortSchemes(
      kNonWildcardDomainNonPortSchemes, kNonWildcardDomainNonPortSchemesSize);
Author	SHA1	Message	Date
Marshall Greenblatt	3cd94714f7	alloy: Move warning after logging init (fixes #3713 )	2024-06-10 11:04:38 -04:00
Julian Waller	69b959514c	cmake: Skip docs generation if the Doxyfile is missing The Doxyfile is not included with minimal distributions.	2024-06-10 11:04:31 -04:00