From 33ec6b80fcb38754276bd3e8b84d0e6e42bdd03c Mon Sep 17 00:00:00 2001 From: Vladimir Sumarov Date: Wed, 4 Sep 2024 13:37:45 -0700 Subject: [PATCH 1/3] remove qt deps from browser source --- CMakeLists.txt | 2 +- cmake/os-macos.cmake | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bef54262e..803c74b1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ find_package(nlohmann_json REQUIRED) add_library(obs-browser MODULE) add_library(OBS::browser ALIAS obs-browser) -option(ENABLE_BROWSER_PANELS "Enable Qt web browser panel support" ON) +option(ENABLE_BROWSER_PANELS "Enable Qt web browser panel support" OFF) mark_as_advanced(ENABLE_BROWSER_PANELS) set(obs-browser_SOURCES diff --git a/cmake/os-macos.cmake b/cmake/os-macos.cmake index e6a2bb196..e0ce376ea 100644 --- a/cmake/os-macos.cmake +++ b/cmake/os-macos.cmake @@ -1,15 +1,13 @@ -find_qt(COMPONENTS Widgets) - find_library(COREFOUNDATION CoreFoundation) find_library(APPKIT AppKit) mark_as_advanced(COREFOUNDATION APPKIT) -target_compile_definitions(obs-browser PRIVATE ENABLE_BROWSER_SHARED_TEXTURE ENABLE_BROWSER_QT_LOOP) +target_compile_definitions(obs-browser PRIVATE ENABLE_BROWSER_SHARED_TEXTURE) if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 14.0.3) target_compile_options(obs-browser PRIVATE -Wno-error=unqualified-std-cast-call) endif() -target_link_libraries(obs-browser PRIVATE Qt::Widgets ${COREFOUNDATION} ${APPKIT} CEF::Wrapper) +target_link_libraries(obs-browser PRIVATE ${COREFOUNDATION} ${APPKIT} CEF::Wrapper) set(helper_basename browser-helper) set(helper_output_name "obs64 Helper") From 1d5600e5b8f7ff3df043d9737ffd6cb3062d28ba Mon Sep 17 00:00:00 2001 From: Vladimir Sumarov Date: Wed, 18 Dec 2024 15:24:17 -0800 Subject: [PATCH 2/3] merge fix --- cmake/os-windows.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/os-windows.cmake b/cmake/os-windows.cmake index db3c18760..db976356c 100644 --- a/cmake/os-windows.cmake +++ b/cmake/os-windows.cmake @@ -4,27 +4,27 @@ target_compile_definitions(obs-browser PRIVATE ENABLE_BROWSER_SHARED_TEXTURE) target_link_libraries(obs-browser PRIVATE CEF::Wrapper CEF::Library d3d11 dxgi) target_link_options(obs-browser PRIVATE /IGNORE:4099) -add_executable(obs-browser-helper WIN32 EXCLUDE_FROM_ALL) -add_executable(OBS::browser-helper ALIAS obs-browser-helper) +add_executable(obs-browser-page WIN32 EXCLUDE_FROM_ALL) +add_executable(OBS::browser-helper ALIAS obs-browser-page) target_sources( - obs-browser-helper + obs-browser-page PRIVATE # cmake-format: sortable browser-app.cpp browser-app.hpp cef-headers.hpp obs-browser-page.manifest obs-browser-page/obs-browser-page-main.cpp) -target_include_directories(obs-browser-helper PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/deps" +target_include_directories(obs-browser-page PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/deps" "${CMAKE_CURRENT_SOURCE_DIR}/obs-browser-page") -target_compile_options(obs-browser-helper PRIVATE $,/MTd,/MT>) -target_compile_definitions(obs-browser-helper PRIVATE ENABLE_BROWSER_SHARED_TEXTURE) +target_compile_options(obs-browser-page PRIVATE $,/MTd,/MT>) +target_compile_definitions(obs-browser-page PRIVATE ENABLE_BROWSER_SHARED_TEXTURE) -target_link_libraries(obs-browser-helper PRIVATE CEF::Wrapper CEF::Library nlohmann_json::nlohmann_json) -target_link_options(obs-browser-helper PRIVATE /IGNORE:4099 /SUBSYSTEM:WINDOWS) +target_link_libraries(obs-browser-page PRIVATE CEF::Wrapper CEF::Library nlohmann_json::nlohmann_json) +target_link_options(obs-browser-page PRIVATE /IGNORE:4099 /SUBSYSTEM:WINDOWS) set(OBS_EXECUTABLE_DESTINATION "${OBS_PLUGIN_DESTINATION}") set_target_properties_obs( - obs-browser-helper + obs-browser-page PROPERTIES FOLDER plugins/obs-browser PREFIX "" OUTPUT_NAME obs-browser-page) From 800a9830601cbcd0f90493f3d876eaf1e0117f7a Mon Sep 17 00:00:00 2001 From: Vladimir Sumarov Date: Thu, 19 Dec 2024 15:47:17 -0800 Subject: [PATCH 3/3] merge fix --- cmake/os-windows.cmake | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/cmake/os-windows.cmake b/cmake/os-windows.cmake index db976356c..a1c829e86 100644 --- a/cmake/os-windows.cmake +++ b/cmake/os-windows.cmake @@ -4,27 +4,32 @@ target_compile_definitions(obs-browser PRIVATE ENABLE_BROWSER_SHARED_TEXTURE) target_link_libraries(obs-browser PRIVATE CEF::Wrapper CEF::Library d3d11 dxgi) target_link_options(obs-browser PRIVATE /IGNORE:4099) -add_executable(obs-browser-page WIN32 EXCLUDE_FROM_ALL) -add_executable(OBS::browser-helper ALIAS obs-browser-page) +add_executable(obs-browser-helper WIN32 EXCLUDE_FROM_ALL) +add_executable(OBS::browser-helper ALIAS obs-browser-helper) target_sources( - obs-browser-page + obs-browser-helper PRIVATE # cmake-format: sortable browser-app.cpp browser-app.hpp cef-headers.hpp obs-browser-page.manifest obs-browser-page/obs-browser-page-main.cpp) -target_include_directories(obs-browser-page PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/deps" +target_include_directories(obs-browser-helper PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/deps" "${CMAKE_CURRENT_SOURCE_DIR}/obs-browser-page") -target_compile_options(obs-browser-page PRIVATE $,/MTd,/MT>) -target_compile_definitions(obs-browser-page PRIVATE ENABLE_BROWSER_SHARED_TEXTURE) +target_compile_options(obs-browser-helper PRIVATE $,/MTd,/MT>) +target_compile_definitions(obs-browser-helper PRIVATE ENABLE_BROWSER_SHARED_TEXTURE) -target_link_libraries(obs-browser-page PRIVATE CEF::Wrapper CEF::Library nlohmann_json::nlohmann_json) -target_link_options(obs-browser-page PRIVATE /IGNORE:4099 /SUBSYSTEM:WINDOWS) +target_link_libraries(obs-browser-helper PRIVATE CEF::Wrapper CEF::Library nlohmann_json::nlohmann_json) +target_link_options(obs-browser-helper PRIVATE /IGNORE:4099 /SUBSYSTEM:WINDOWS) + +message(STATUS "Buiding browser source plugin helper for Windows") set(OBS_EXECUTABLE_DESTINATION "${OBS_PLUGIN_DESTINATION}") set_target_properties_obs( - obs-browser-page + obs-browser-helper PROPERTIES FOLDER plugins/obs-browser PREFIX "" OUTPUT_NAME obs-browser-page) + +#make it dependence for obs-browser +add_dependencies(obs-browser obs-browser-helper) \ No newline at end of file