From 1faccf8ee3d752663f3435f0942970097d0c58af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Fri, 11 Nov 2016 18:11:17 +0100 Subject: [PATCH] Better build process --- .gitmodules | 3 +++ CMakeLists.txt | 7 +++++++ deps/mbedtls | 1 + 3 files changed, 11 insertions(+) create mode 100644 .gitmodules create mode 160000 deps/mbedtls diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..a85f0ae6 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "deps/mbedtls"] + path = deps/mbedtls + url = https://github.com/ARMmbed/mbedtls diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f9050ad..cc4d9079 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,11 +10,17 @@ find_package(LibObs REQUIRED) find_package(Qt5Core REQUIRED) find_package(Qt5WebSockets REQUIRED) +set(OBS_FRONTEND_LIB "OBS_FRONTEND_LIB-NOTFOUND" CACHE FILEPATH "OBS frontend library") +if(OBS_FRONTEND_LIB EQUAL "OBS_FRONTEND_LIB-NOTFOUND") + message(FATAL_ERROR "Could not find OBS Frontend API\'s library !") +endif() + set(obs-websocket_SOURCES obs-websocket.cpp WSServer.cpp WSRequestHandler.cpp WSEvents.cpp + Config.cpp Utils.cpp) set(obs-websocket_HEADERS @@ -22,6 +28,7 @@ set(obs-websocket_HEADERS WSServer.h WSRequestHandler.h WSEvents.h + Config.h Utils.h) add_library(obs-websocket MODULE diff --git a/deps/mbedtls b/deps/mbedtls new file mode 160000 index 00000000..ea67eeb4 --- /dev/null +++ b/deps/mbedtls @@ -0,0 +1 @@ +Subproject commit ea67eeb4e8e6cdbaa8770935a848b11d231217bb