From 2557dd7439806448ad41b7bc5f175f4ed4f74d9c Mon Sep 17 00:00:00 2001 From: d3x0r Date: Thu, 6 Jul 2017 02:09:44 -0700 Subject: Add option LIBRESSL_SKIP_INSTALL Internally LIBRESSL_SKIP_INSTALL, if not set becomes ENABLE_LIBRESSL_INSTALL so this by default is enabled. defining LIBRESSL_SKIP_INSTALL before hand will disable all install() rules. This is useful if another project includes and links to this statically. I chose to add a prefix to avoid potential name collision because the options are cached globally. If the installation is skipped, maybe it should also disable building apps? I didn't do that. --- apps/nc/CMakeLists.txt | 6 ++++-- apps/ocspcheck/CMakeLists.txt | 6 ++++-- apps/openssl/CMakeLists.txt | 12 ++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) (limited to 'apps') diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt index c8757a6..424c676 100644 --- a/apps/nc/CMakeLists.txt +++ b/apps/nc/CMakeLists.txt @@ -53,8 +53,10 @@ add_executable(nc ${NC_SRC}) target_link_libraries(nc tls ${OPENSSL_LIBS}) if(ENABLE_NC) - install(TARGETS nc DESTINATION bin) - install(FILES nc.1 DESTINATION share/man/man1) + if(ENABLE_LIBRESSL_INSTALL) + install(TARGETS nc DESTINATION bin) + install(FILES nc.1 DESTINATION share/man/man1) + endif(ENABLE_LIBRESSL_INSTALL) endif() endif() diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt index a14485e..064c367 100644 --- a/apps/ocspcheck/CMakeLists.txt +++ b/apps/ocspcheck/CMakeLists.txt @@ -36,7 +36,9 @@ endif() add_executable(ocspcheck ${OCSPCHECK_SRC}) target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) -install(TARGETS ocspcheck DESTINATION bin) -install(FILES ocspcheck.8 DESTINATION share/man/man8) +if(ENABLE_LIBRESSL_INSTALL) + install(TARGETS ocspcheck DESTINATION bin) + install(FILES ocspcheck.8 DESTINATION share/man/man8) +endif(ENABLE_LIBRESSL_INSTALL) endif() diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt index 9512065..cf5c852 100644 --- a/apps/openssl/CMakeLists.txt +++ b/apps/openssl/CMakeLists.txt @@ -76,13 +76,17 @@ endif() add_executable(openssl ${OPENSSL_SRC}) target_link_libraries(openssl ${OPENSSL_LIBS}) -install(TARGETS openssl DESTINATION bin) -install(FILES openssl.1 DESTINATION share/man/man1) +if(ENABLE_LIBRESSL_INSTALL) + install(TARGETS openssl DESTINATION bin) + install(FILES openssl.1 DESTINATION share/man/man1) +endif(ENABLE_LIBRESSL_INSTALL) if(NOT "${OPENSSLDIR}" STREQUAL "") set(CONF_DIR "${OPENSSLDIR}") else() set(CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/ssl") endif() -install(FILES cert.pem openssl.cnf x509v3.cnf DESTINATION ${CONF_DIR}) -install(DIRECTORY DESTINATION ${CONF_DIR}/cert) +if(ENABLE_LIBRESSL_INSTALL) + install(FILES cert.pem openssl.cnf x509v3.cnf DESTINATION ${CONF_DIR}) + install(DIRECTORY DESTINATION ${CONF_DIR}/cert) +endif(ENABLE_LIBRESSL_INSTALL) -- cgit v1.2.3-55-g6feb