berdav/cado
1
0
Fork 0
mirror of https://github.com/rd235/cado synced 2025-06-05 21:59:29 +02:00
Code Issues Releases Wiki Activity

Fix CADO_SPOOL_DIR path and change PostInstall flag

Browse Source
This commit is contained in:
Mattia Biondi
2020-05-03 15:34:22 +02:00
parent 8cadce02ae
commit 792020b65d
2 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -10,6 +10,8 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2 -O2 -Wall -pedantic")
set(LIBS_REQUIRED cap execs mhash pam pam_misc) set(LIBS_REQUIRED cap execs mhash pam pam_misc)
option(CADO_RUN_POST_INSTALL "Run PostInstall.cmake" ON)
foreach(THISLIB IN LISTS LIBS_REQUIRED) foreach(THISLIB IN LISTS LIBS_REQUIRED)
find_library(${THISLIB}_library ${THISLIB}) find_library(${THISLIB}_library ${THISLIB})
if(NOT ${THISLIB}_library) if(NOT ${THISLIB}_library)
@ -24,7 +26,8 @@ else (WITHEDITOR)
endif (WITHEDITOR) endif (WITHEDITOR)
# Spool dir for scado files # Spool dir for scado files
set(CADO_SPOOL_DIR "/usr/local/var/spool/cado") set(CADO_SPOOL_DIR
"${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/spool/${CMAKE_PROJECT_NAME}")
configure_file( configure_file(
"include/config.h.in" "include/config.h.in"

2
src/CMakeLists.txt
View File

@ -34,7 +34,7 @@ install(
DESTINATION ${CMAKE_INSTALL_BINDIR} DESTINATION ${CMAKE_INSTALL_BINDIR}
) )
if(NOT DEBUILD) if(CADO_RUN_POST_INSTALL)
install( install(
CODE "execute_process( CODE "execute_process(
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}