Skip to content

Instantly share code, notes, and snippets.

@NexAdn
Created December 31, 2018 09:42
Show Gist options
  • Save NexAdn/e72d2674cbe71bf514f3d4cec0b50cf4 to your computer and use it in GitHub Desktop.
Save NexAdn/e72d2674cbe71bf514f3d4cec0b50cf4 to your computer and use it in GitHub Desktop.
Patch to allow installation on Ubuntu systems
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2871b4c..6a90515 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.8)
+cmake_minimum_required (VERSION 3.0)
project (obs-linuxbrowser LANGUAGES C CXX VERSION 0.5.2)
set(CMAKE_BUILD_TYPE Release CACHE STRING "CMake build type")
@@ -48,16 +48,8 @@ file(COPY ${CEF_RESOURCE_DIR}/locales DESTINATION ${PLUGIN_CEF_DATA_DIRECTORY})
# compilation
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-
-set(LINUXBROWSER_CXX_FEATURES
- cxx_std_11
- cxx_auto_type
- cxx_constexpr
- cxx_deleted_functions
- cxx_nullptr
- cxx_override
- cxx_range_for
-)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED true)
# Ensure a consistent command chain on all systems
set(CMAKE_CXX_EXTENSIONS false)
@@ -98,10 +90,14 @@ add_library(browser_shared OBJECT ${BROWSER_SHARED_SOURCES})
add_executable(browser ${BROWSER_SOURCES} $<TARGET_OBJECTS:browser_shared>)
target_link_libraries(browser ${CEF_LIBRARIES} pthread rt -static-libstdc++)
target_compile_features(browser PUBLIC ${LINUXBROWSER_CXX_FEATURES})
+# set_property(TARGET browser PROPERTY CXX_STANDARD 11)
+# set_property(TARGET browser PROPERTY CXX_STANDARD_REQUIRED true)
add_executable(browser-subprocess ${BROWSER_SUBPROCESS_SOURCES} $<TARGET_OBJECTS:browser_shared>)
target_link_libraries(browser-subprocess ${CEF_LIBRARIES} pthread rt -static-libstdc++)
target_compile_features(browser-subprocess PUBLIC ${LINUXBROWSER_CXX_FEATURES})
+# set_property(TARGET browser-subprocess PROPERTY CXX_STANDARD 11)
+# set_property(TARGET browser-subprocess PROPERTY CXX_STANDARD_REQUIRED true)
if (${INSTALL_SYSTEMWIDE})
install(DIRECTORY ${PLUGIN_BIN_DIRECTORY}/ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/obs-plugins)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment