From 9e977ef8b8ef97f94f4d0c804f295317b9b13a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20S=C3=B6derberg?= <joakim.soderberg@gmail.com>
Date: Sun, 15 Oct 2017 17:47:02 +0200
Subject: [PATCH] Fix cmake comments
See #92
- Turn off libwebsockets options properly (including SSL since it's not used)
- Default WITH_SYSTEMD_USER to OFF, since running as a non-root user means
we need to setup udev rules which is not done yet
- Added some TODO:s on possible improvements
---
server/CMakeLists.txt | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 2f10f0c..c3e76da 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -15,7 +15,7 @@ option(USE_BUILTIN_LIBUSB "Use the built-in libusb" ON)
option(APPEND_PLATFORM "Append the platform to the executable name" OFF)
option(WITH_INSTALL_TARGETS "Generate install targets used by make install and CPack for example" ON)
option(WITH_SYSTEMD_SERVICE "Creates an install target for a SystemD service" ON)
-option(WITH_SYSTEMD_USER "Run the SystemD service using a special user. Name of the user can be changed using -DFCSERVER_USER=username" ON)
+option(WITH_SYSTEMD_USER "Run the SystemD service using a special user. Name of the user can be changed using -DFCSERVER_USER=username" OFF)
set(FCSERVER_USER "fcserver" CACHE STRING "The user that is created after a debian package installation if WITH_SYSTEMD_USER is enabled")
# TODO: Enable installing init daemon instead
@@ -154,9 +154,11 @@ include_directories("${PROJECT_SOURCE_DIR}/")
if (USE_BUILTIN_WS)
# Turn off unused libwebsockets parts.
- set(WITHOUT_CLIENT ON)
- set(WITHOUT_EXTENSIONS ON)
- set(WITHOUT_TESTAPPS ON)
+ # TODO: Once libwebsockets version is updated these need to change, newer version uses prefix "LWS_*"
+ set(WITHOUT_CLIENT ON CACHE BOOL "")
+ set(WITHOUT_EXTENSIONS ON CACHE BOOL "")
+ set(WITHOUT_TESTAPPS ON CACHE BOOL "")
+ set(WITH_SSL OFF CACHE BOOL "")
# Newer versions of CMake will complain since the libwebockets
# version we're using is quite old.
@@ -270,6 +272,10 @@ if (WITH_INSTALL_TARGETS)
set(SYSTEMD_UNIT_NAME "${PROJECT_BINARY_DIR}/${EXECUTABLE_NAME}.service")
if (WITH_SYSTEMD_USER)
+ # TODO: Setup proper udev rules for FCSERVER_USER in the postinst.in script
+ # currently this must be done manually which is quite tedious.
+ # http://www.reactivated.net/writing_udev_rules.html
+
# Run as specified user in FCSERVER_USER.
configure_file("${PROJECT_SOURCE_DIR}/cmake/fcserver-user.service.in"
"${SYSTEMD_UNIT_NAME}")
--
GitLab