From 83382d8dcfcad2d6ade10fcdf6a4e22d4ee7e996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20L?= Date: Sat, 11 May 2019 17:13:41 +0200 Subject: [PATCH] general: remove boost remains --- CI/build-macos.sh | 1 - CI/install-dependencies-macos.sh | 2 +- CI/install-dependencies-xenial.sh | 3 +-- CMakeLists.txt | 2 -- appveyor.yml | 5 ++--- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/CI/build-macos.sh b/CI/build-macos.sh index c41ebaf6..f528ce2e 100755 --- a/CI/build-macos.sh +++ b/CI/build-macos.sh @@ -20,7 +20,6 @@ echo "[obs-websocket] Building 'obs-websocket' for macOS." mkdir -p build && cd build cmake .. \ -DQTDIR=/usr/local/opt/qt \ - -DBOOST_ROOT=/usr/local/opt/boost \ -DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \ -DLIBOBS_LIB=../../obs-studio/libobs \ -DOBS_FRONTEND_LIB="$(pwd)/../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib" \ diff --git a/CI/install-dependencies-macos.sh b/CI/install-dependencies-macos.sh index 21a3ae55..0adf464b 100755 --- a/CI/install-dependencies-macos.sh +++ b/CI/install-dependencies-macos.sh @@ -21,7 +21,7 @@ echo "[obs-websocket] Updating Homebrew.." brew update >/dev/null echo "[obs-websocket] Checking installed Homebrew formulas.." BREW_PACKAGES=$(brew list) -BREW_DEPENDENCIES="jack speexdsp ccache swig mbedtls boost" +BREW_DEPENDENCIES="jack speexdsp ccache swig mbedtls" for DEPENDENCY in ${BREW_DEPENDENCIES}; do if echo "${BREW_PACKAGES}" | grep -q "^${DEPENDENCY}\$"; then diff --git a/CI/install-dependencies-xenial.sh b/CI/install-dependencies-xenial.sh index 4b4041bd..bd9dd03d 100755 --- a/CI/install-dependencies-xenial.sh +++ b/CI/install-dependencies-xenial.sh @@ -11,8 +11,7 @@ apt-get install -y \ checkinstall \ cmake \ obs-studio \ - qtbase5-dev \ - libboost-all-dev + qtbase5-dev # Dirty hack wget -O /usr/include/obs/obs-frontend-api.h https://raw.githubusercontent.com/obsproject/obs-studio/master/UI/obs-frontend-api/obs-frontend-api.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 19c8e88f..bcd31ca8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,6 @@ endif() find_package(LibObs REQUIRED) find_package(Qt5Core REQUIRED) find_package(Qt5Widgets REQUIRED) -find_package(Boost REQUIRED) set(obs-websocket_SOURCES src/obs-websocket.cpp @@ -67,7 +66,6 @@ include_directories( "${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api" ${Qt5Core_INCLUDES} ${Qt5Widgets_INCLUDES} - ${Boost_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/deps/asio/asio/include" "${CMAKE_SOURCE_DIR}/deps/websocketpp") diff --git a/appveyor.yml b/appveyor.yml index b75bfd83..c12a2501 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,6 @@ install: - 7z x dependencies2015.zip -odependencies2015 - set DepsPath32=%CD%\dependencies2015\win32 - set DepsPath64=%CD%\dependencies2015\win64 - - set BoostRoot=C:\Libraries\boost_1_67_0 - call C:\projects\obs-websocket\CI\install-setup-qt.cmd - set build_config=RelWithDebInfo - call C:\projects\obs-websocket\CI\install-build-obs.cmd @@ -16,9 +15,9 @@ install: - mkdir build32 - mkdir build64 - cd ./build32 - - cmake -G "Visual Studio 14 2015" -DQTDIR="%QTDIR32%" -DBOOST_ROOT="%BoostRoot%" -DLibObs_DIR="C:\projects\obs-studio\build32\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" .. + - cmake -G "Visual Studio 14 2015" -DQTDIR="%QTDIR32%" -DLibObs_DIR="C:\projects\obs-studio\build32\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" .. - cd ../build64 - - cmake -G "Visual Studio 14 2015 Win64" -DQTDIR="%QTDIR64%" -DBOOST_ROOT="%BoostRoot%" -DLibObs_DIR="C:\projects\obs-studio\build64\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build64\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build64\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" .. + - cmake -G "Visual Studio 14 2015 Win64" -DQTDIR="%QTDIR64%" -DLibObs_DIR="C:\projects\obs-studio\build64\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build64\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build64\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" .. build_script: - call msbuild /m /p:Configuration=%build_config% C:\projects\obs-websocket\build32\obs-websocket.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"