aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2016-05-02 01:58:18 -0500
committerBrent Cook <bcook@openbsd.org>2016-05-02 01:58:18 -0500
commita653a67a1ee84e41e0a989ecdc54a17e32fdd6fe (patch)
tree106c0df3da2b3032a5c01fcfebccf8d6de9c64d9 /apps
parent466e389d3f52c9e75cf4849669bca16e512ee110 (diff)
parentbda62f7fe4ad3965f8f6e7f06838c76455340567 (diff)
downloadportable-a653a67a1ee84e41e0a989ecdc54a17e32fdd6fe.tar.gz
portable-a653a67a1ee84e41e0a989ecdc54a17e32fdd6fe.tar.bz2
portable-a653a67a1ee84e41e0a989ecdc54a17e32fdd6fe.zip
Land #189, Added extra cmake build options like autotools builds
Diffstat (limited to 'apps')
-rw-r--r--apps/nc/CMakeLists.txt6
-rw-r--r--apps/openssl/CMakeLists.txt8
2 files changed, 14 insertions, 0 deletions
diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt
index a218899..c8757a6 100644
--- a/apps/nc/CMakeLists.txt
+++ b/apps/nc/CMakeLists.txt
@@ -43,6 +43,12 @@ else()
43 set(NC_SRC ${NC_SRC} compat/strtonum.c) 43 set(NC_SRC ${NC_SRC} compat/strtonum.c)
44endif() 44endif()
45 45
46if(NOT "${OPENSSLDIR}" STREQUAL "")
47 add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
48else()
49 add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
50endif()
51
46add_executable(nc ${NC_SRC}) 52add_executable(nc ${NC_SRC})
47target_link_libraries(nc tls ${OPENSSL_LIBS}) 53target_link_libraries(nc tls ${OPENSSL_LIBS})
48 54
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt
index d4f786b..0d4642e 100644
--- a/apps/openssl/CMakeLists.txt
+++ b/apps/openssl/CMakeLists.txt
@@ -79,3 +79,11 @@ target_link_libraries(openssl ${OPENSSL_LIBS})
79 79
80install(TARGETS openssl DESTINATION bin) 80install(TARGETS openssl DESTINATION bin)
81install(FILES openssl.1 DESTINATION share/man/man1) 81install(FILES openssl.1 DESTINATION share/man/man1)
82
83if(NOT "${OPENSSLDIR}" STREQUAL "")
84 set(CONF_DIR "${OPENSSLDIR}")
85else()
86 set(CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/ssl")
87endif()
88install(FILES cert.pem openssl.cnf x509v3.cnf DESTINATION ${CONF_DIR})
89install(DIRECTORY DESTINATION ${CONF_DIR}/cert)