aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2017-07-09 05:06:06 -0500
committerBrent Cook <bcook@openbsd.org>2017-07-09 05:06:06 -0500
commit0dbae37735a395e3c378ac944842e359f8087d41 (patch)
tree18aaf9fa1665455886fc171edbb8857ef5c35a21 /apps
parentc18852f650a3cb258e10222695a31ed5c929ab23 (diff)
parent0e82f22d16dc4c45bd45f9a994a30fc7435d430b (diff)
downloadportable-0dbae37735a395e3c378ac944842e359f8087d41.tar.gz
portable-0dbae37735a395e3c378ac944842e359f8087d41.tar.bz2
portable-0dbae37735a395e3c378ac944842e359f8087d41.zip
Land #324, Add option LIBRESSL_SKIP_INSTALL
Diffstat (limited to 'apps')
-rw-r--r--apps/nc/CMakeLists.txt6
-rw-r--r--apps/ocspcheck/CMakeLists.txt7
-rw-r--r--apps/openssl/CMakeLists.txt12
3 files changed, 17 insertions, 8 deletions
diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt
index be38146..64d14fa 100644
--- a/apps/nc/CMakeLists.txt
+++ b/apps/nc/CMakeLists.txt
@@ -53,8 +53,10 @@ add_executable(nc ${NC_SRC})
53target_link_libraries(nc tls ${OPENSSL_LIBS}) 53target_link_libraries(nc tls ${OPENSSL_LIBS})
54 54
55if(ENABLE_NC) 55if(ENABLE_NC)
56 install(TARGETS nc DESTINATION ${CMAKE_INSTALL_BINDIR}) 56 if(ENABLE_LIBRESSL_INSTALL)
57 install(FILES nc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) 57 install(TARGETS nc DESTINATION ${CMAKE_INSTALL_BINDIR})
58 install(FILES nc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
59 endif(ENABLE_LIBRESSL_INSTALL)
58endif() 60endif()
59 61
60endif() 62endif()
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
index 478f232..af245f4 100644
--- a/apps/ocspcheck/CMakeLists.txt
+++ b/apps/ocspcheck/CMakeLists.txt
@@ -36,7 +36,10 @@ endif()
36add_executable(ocspcheck ${OCSPCHECK_SRC}) 36add_executable(ocspcheck ${OCSPCHECK_SRC})
37target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) 37target_link_libraries(ocspcheck tls ${OPENSSL_LIBS})
38 38
39install(TARGETS ocspcheck DESTINATION ${CMAKE_INSTALL_BINDIR}) 39if(ENABLE_LIBRESSL_INSTALL)
40install(FILES ocspcheck.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) 40 install(TARGETS ocspcheck DESTINATION ${CMAKE_INSTALL_BINDIR})
41 install(FILES ocspcheck.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
42
43endif(ENABLE_LIBRESSL_INSTALL)
41 44
42endif() 45endif()
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt
index 2e47840..71fbd63 100644
--- a/apps/openssl/CMakeLists.txt
+++ b/apps/openssl/CMakeLists.txt
@@ -76,13 +76,17 @@ endif()
76add_executable(openssl ${OPENSSL_SRC}) 76add_executable(openssl ${OPENSSL_SRC})
77target_link_libraries(openssl ${OPENSSL_LIBS}) 77target_link_libraries(openssl ${OPENSSL_LIBS})
78 78
79install(TARGETS openssl DESTINATION ${CMAKE_INSTALL_BINDIR}) 79if(ENABLE_LIBRESSL_INSTALL)
80install(FILES openssl.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) 80 install(TARGETS openssl DESTINATION ${CMAKE_INSTALL_BINDIR})
81 install(FILES openssl.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
82endif(ENABLE_LIBRESSL_INSTALL)
81 83
82if(NOT "${OPENSSLDIR}" STREQUAL "") 84if(NOT "${OPENSSLDIR}" STREQUAL "")
83 set(CONF_DIR "${OPENSSLDIR}") 85 set(CONF_DIR "${OPENSSLDIR}")
84else() 86else()
85 set(CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/ssl") 87 set(CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/ssl")
86endif() 88endif()
87install(FILES cert.pem openssl.cnf x509v3.cnf DESTINATION ${CONF_DIR}) 89if(ENABLE_LIBRESSL_INSTALL)
88install(DIRECTORY DESTINATION ${CONF_DIR}/cert) 90 install(FILES cert.pem openssl.cnf x509v3.cnf DESTINATION ${CONF_DIR})
91 install(DIRECTORY DESTINATION ${CONF_DIR}/cert)
92endif(ENABLE_LIBRESSL_INSTALL)