From 89fcb1a3e50ac224d68891a6014b74639a5f551a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 5 Nov 2023 08:56:09 +0000 Subject: also fix ocspcheck and nc, dedupe build logic --- apps/nc/CMakeLists.txt | 6 +----- apps/ocspcheck/CMakeLists.txt | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'apps') diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt index ffd68e5..868b797 100644 --- a/apps/nc/CMakeLists.txt +++ b/apps/nc/CMakeLists.txt @@ -29,11 +29,7 @@ else() set(NC_SRC ${NC_SRC} compat/readpassphrase.c) endif() -if(NOT "${OPENSSLDIR}" STREQUAL "") - add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") -else() - add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") -endif() +add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") add_executable(nc ${NC_SRC}) target_include_directories(nc diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt index 9cf7a8b..41c7845 100644 --- a/apps/ocspcheck/CMakeLists.txt +++ b/apps/ocspcheck/CMakeLists.txt @@ -11,11 +11,7 @@ else() set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c) endif() -if(NOT "${OPENSSLDIR}" STREQUAL "") - add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") -else() - add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") -endif() +add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") add_executable(ocspcheck ${OCSPCHECK_SRC}) target_include_directories(ocspcheck -- cgit v1.2.3-55-g6feb