Skip to content

Commit

Permalink
Remove unused cmake scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
badaix committed Aug 5, 2020
1 parent 8186c44 commit 53dfeb1
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 61 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Expand Up @@ -253,6 +253,8 @@ endif()

list(APPEND CMAKE_REQUIRED_INCLUDES "${INCLUDE_DIRS}")

#include(${CMAKE_SOURCE_DIR}/cmake/SystemdService.cmake)

add_subdirectory(common)

if (BUILD_SERVER)
Expand Down
61 changes: 0 additions & 61 deletions cmake/Findsoxr.cmake

This file was deleted.

21 changes: 21 additions & 0 deletions cmake/SystemdService.cmake
@@ -0,0 +1,21 @@
########
# Find systemd service dir

pkg_check_modules(SYSTEMD "systemd")
if (SYSTEMD_FOUND AND "${SYSTEMD_SERVICES_INSTALL_DIR}" STREQUAL "")
execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE}
--variable=systemdsystemunitdir systemd
OUTPUT_VARIABLE SYSTEMD_SERVICES_INSTALL_DIR)
string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_SERVICES_INSTALL_DIR
"${SYSTEMD_SERVICES_INSTALL_DIR}")
elseif (NOT SYSTEMD_FOUND AND SYSTEMD_SERVICES_INSTALL_DIR)
message (FATAL_ERROR "Variable SYSTEMD_SERVICES_INSTALL_DIR is\
defined, but we can't find systemd using pkg-config")
endif()

if (SYSTEMD_FOUND)
set(WITH_SYSTEMD "ON")
message(STATUS "systemd services install dir: ${SYSTEMD_SERVICES_INSTALL_DIR}")
else()
set(WITH_SYSTEMD "OFF")
endif (SYSTEMD_FOUND)
Empty file removed cmake/modules/FindAsio.cmake
Empty file.
1 change: 1 addition & 0 deletions server/CMakeLists.txt
Expand Up @@ -87,3 +87,4 @@ install(TARGETS snapserver COMPONENT server DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES snapserver.1 COMPONENT server DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
install(FILES etc/snapserver.conf COMPONENT server DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
install(DIRECTORY etc/snapweb/ DESTINATION ${CMAKE_INSTALL_DATADIR}/snapserver/snapweb)
#install(FILES ../debian/snapserver.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR})

0 comments on commit 53dfeb1

Please sign in to comment.