Skip to content

additional configurability of what gets installed #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peterph wants to merge 4 commits into
base: master
Choose a base branch
from
Open

additional configurability of what gets installed #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9d3a82
Conditional build of slimlock and installation of slimlock.1 man page.
peterph Jan 18, 2016
b12df20
New option disabling installation of systemd stuff
peterph Jan 20, 2016
d8f98a8
Better systemd variable description
peterph Jan 21, 2016
8400244
Report whether systemd files will be installed
peterph Jan 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2")
set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wall -g -O2")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -O2")

if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(HAVE_SYSTEMD yes CACHE BOOL "Install systemd related files")
else()
set(HAVE_SYSTEMD no CACHE BOOL "Do not install systemd related files")
endif()

# source
set(slim_srcs
main.cpp
Expand Down Expand Up @@ -156,6 +162,13 @@ else(USE_CONSOLEKIT)
message("\tConsoleKit disabled")
endif(USE_CONSOLEKIT)

# systemd
if(HAVE_SYSTEMD)
message("\tInstall systemd files")
else(HAVE_SYSTEMD)
message("\tDo not install systemd files")
endif(HAVE_SYSTEMD)

# system librarys
find_library(M_LIB m)
find_library(RT_LIB rt)
Expand Down Expand Up @@ -221,7 +234,9 @@ endif(BUILD_SLIMLOCK)
####### install
# slim
install(TARGETS slim RUNTIME DESTINATION bin)
install(TARGETS slimlock RUNTIME DESTINATION bin)
if(BUILD_SLIMLOCK)
install(TARGETS slimlock RUNTIME DESTINATION bin)
endif(BUILD_SLIMLOCK)

if (BUILD_SHARED_LIBS)
set_target_properties(libslim PROPERTIES
Expand All @@ -236,12 +251,14 @@ endif (BUILD_SHARED_LIBS)

# man file
install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
if(BUILD_SLIMLOCK)
install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
endif(BUILD_SLIMLOCK)
# configure
install(FILES slim.conf DESTINATION ${SYSCONFDIR})
# systemd service file
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if(HAVE_SYSTEMD)
install(FILES slim.service DESTINATION ${LIBDIR}/systemd/system)
endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
endif(HAVE_SYSTEMD)
# themes directory
subdirs(themes)
2 changes: 2 additions & 0 deletions INSTALL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ INSTALL file for SLiM
or
- mkdir build ; cd build ; cmake .. -DUSE_CONSOLEKIT=yes
to enable CONSOLEKIT support
- mkdir build ; cd build ; cmake .. -DHAVE_SYSTEMD=no
to prevent installation of systemd related stuff (unit file)
- make && make install

2. automatic startup
Expand Down