From 47492c3fa267ed5686b46779489921bea19e127f Mon Sep 17 00:00:00 2001 From: tt2468 Date: Thu, 30 Apr 2020 09:46:22 -0700 Subject: [PATCH 1/4] Implement fix for Ubuntu users #478 Broke building on linux. This implements a new variable to apply the fix. --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5648a963..a6bbd38f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -187,8 +187,13 @@ if(UNIX AND NOT APPLE) file(GLOB locale_files data/locale/*.ini) - install(TARGETS obs-websocket - LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/obs-plugins") + if(${USE_UBUNTU_FIX}) + install(TARGETS obs-websocket + LIBRARY DESTINATION "/usr/lib/obs-plugins") + else() + install(TARGETS obs-websocket + LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/obs-plugins") + endif() install(FILES ${locale_files} DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/obs/obs-plugins/obs-websocket/locale") From ba75c45cee1d7d6fcf0a7c251fe78e618b0569be Mon Sep 17 00:00:00 2001 From: tt2468 Date: Thu, 30 Apr 2020 09:58:10 -0700 Subject: [PATCH 2/4] Update build docs to add Ubuntu fix flag --- BUILDING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILDING.md b/BUILDING.md index 83f93a99..0770fd59 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -24,7 +24,7 @@ sudo apt-get install libboost-all-dev git clone --recursive https://github.com/Palakis/obs-websocket.git cd obs-websocket mkdir build && cd build -cmake -DLIBOBS_INCLUDE_DIR="" -DCMAKE_INSTALL_PREFIX=/usr .. +cmake -DLIBOBS_INCLUDE_DIR="" -DCMAKE_INSTALL_PREFIX=/usr -DUSE_UBUNTU_FIX=true .. make -j4 sudo make install ``` From f9c81f99f2f5987d88b63334771817eb30d9deb8 Mon Sep 17 00:00:00 2001 From: tt2468 Date: Tue, 12 May 2020 02:24:27 -0700 Subject: [PATCH 3/4] Install into both dirs on Ubuntu instead of only one --- CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6bbd38f..56130453 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,10 +190,9 @@ if(UNIX AND NOT APPLE) if(${USE_UBUNTU_FIX}) install(TARGETS obs-websocket LIBRARY DESTINATION "/usr/lib/obs-plugins") - else() - install(TARGETS obs-websocket - LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/obs-plugins") endif() + install(TARGETS obs-websocket + LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/obs-plugins") install(FILES ${locale_files} DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/obs/obs-plugins/obs-websocket/locale") From 497443f012a968f469355a3c507ca9695da5c2bb Mon Sep 17 00:00:00 2001 From: tt2468 Date: Thu, 14 May 2020 01:47:55 -0700 Subject: [PATCH 4/4] Update CI scripts to use ubuntu fix --- CI/build-ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/build-ubuntu.sh b/CI/build-ubuntu.sh index b19158ae..498840ef 100755 --- a/CI/build-ubuntu.sh +++ b/CI/build-ubuntu.sh @@ -2,5 +2,5 @@ set -ex mkdir build && cd build -cmake -DCMAKE_INSTALL_PREFIX=/usr .. +cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_UBUNTU_FIX=true .. make -j4