54 lines
2.4 KiB
Diff
54 lines
2.4 KiB
Diff
From 0a752f33834a3520a7f18433f48bc9e1e9d32cea Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
Date: Sun, 30 Aug 2020 05:46:42 +0200
|
|
Subject: [PATCH] Only install the xproofd script and man page if xproofd
|
|
option is on
|
|
|
|
---
|
|
CMakeLists.txt | 7 ++++++-
|
|
cmake/modules/RootConfiguration.cmake | 4 ++--
|
|
2 files changed, 8 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 76f6ad93b3..b37a1bbe70 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -528,7 +528,12 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
|
|
if(webgui)
|
|
install(DIRECTORY ui5/ DESTINATION ${CMAKE_INSTALL_OPENUI5DIR})
|
|
endif()
|
|
- install(DIRECTORY man/ DESTINATION ${CMAKE_INSTALL_MANDIR})
|
|
+ if(xproofd AND xrootd AND ssl)
|
|
+ set(MAN_PATT_EXCL)
|
|
+ else()
|
|
+ set(MAN_PATT_EXCL PATTERN xproofd.1 EXCLUDE)
|
|
+ endif()
|
|
+ install(DIRECTORY man/ DESTINATION ${CMAKE_INSTALL_MANDIR} ${MAN_PATT_EXCL})
|
|
install(DIRECTORY tutorials/ DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
|
|
install(FILES
|
|
cmake/modules/RootMacros.cmake
|
|
diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
|
|
index 151235aa4e..a71ac72101 100644
|
|
--- a/cmake/modules/RootConfiguration.cmake
|
|
+++ b/cmake/modules/RootConfiguration.cmake
|
|
@@ -819,7 +819,7 @@ configure_file(${CMAKE_SOURCE_DIR}/config/setxrd.sh ${CMAKE_RUNTIME_OUTPUT_DIREC
|
|
configure_file(${CMAKE_SOURCE_DIR}/config/proofserv.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/proofserv @ONLY NEWLINE_STYLE UNIX)
|
|
configure_file(${CMAKE_SOURCE_DIR}/config/roots.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/roots @ONLY NEWLINE_STYLE UNIX)
|
|
configure_file(${CMAKE_SOURCE_DIR}/config/root-help.el.in root-help.el @ONLY NEWLINE_STYLE UNIX)
|
|
-if (XROOTD_FOUND AND XROOTD_NOMAIN)
|
|
+if(xproofd AND xrootd AND ssl AND XROOTD_NOMAIN)
|
|
configure_file(${CMAKE_SOURCE_DIR}/config/xproofd.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xproofd @ONLY NEWLINE_STYLE UNIX)
|
|
endif()
|
|
if(WIN32)
|
|
@@ -857,7 +857,7 @@ install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/memprobe
|
|
WORLD_EXECUTE WORLD_READ
|
|
DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
|
|
-if (XROOTD_FOUND AND XROOTD_NOMAIN)
|
|
+if(xproofd AND xrootd AND ssl AND XROOTD_NOMAIN)
|
|
install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xproofd
|
|
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
|
|
GROUP_EXECUTE GROUP_READ
|
|
--
|
|
2.26.2
|
|
|