From 0e88c47262d5db21f43dde8c524bf37e97e85f8a Mon Sep 17 00:00:00 2001 From: deuce <> Date: Sun, 9 Feb 2014 12:13:06 +0000 Subject: [PATCH] Use the existance of cryptlib.h to control SSL compiling. --- src/syncterm/CMakeLists.txt | 10 +++++++++- src/syncterm/st_crypt.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/syncterm/CMakeLists.txt b/src/syncterm/CMakeLists.txt index 31e3a79b89..78b084c5cc 100644 --- a/src/syncterm/CMakeLists.txt +++ b/src/syncterm/CMakeLists.txt @@ -2,6 +2,8 @@ project (SyncTERM C) cmake_minimum_required(VERSION 2.8.11) +INCLUDE (CheckIncludeFiles) + set(SOURCE uifc32.c uifcx.c @@ -79,7 +81,14 @@ target_include_directories(syncterm PRIVATE ../uifc) target_include_directories(syncterm PRIVATE ../sbbs3) target_include_directories(syncterm PRIVATE ../comio) target_include_directories(syncterm PRIVATE ../smblib) +if(WIN32) + include_directories(syncterm PRIVATE ../../3rdp/win32.release/cryptlib/include) +endif() target_link_libraries(syncterm m) +CHECK_INCLUDE_FILES(cryptlib.h HAS_CRYPTLIB_H) +if(NOT HAS_CRYPTLIB_H) + target_compile_definitions(syncterm PRIVATE WITHOUT_CRYPTLIB) +endif() if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD") target_link_libraries(syncterm util) @@ -91,5 +100,4 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") target_link_libraries(syncterm util) endif() - install(TARGETS syncterm DESTINATION bin) diff --git a/src/syncterm/st_crypt.h b/src/syncterm/st_crypt.h index c355381eab..715e9caa20 100644 --- a/src/syncterm/st_crypt.h +++ b/src/syncterm/st_crypt.h @@ -4,7 +4,7 @@ #define _ST_CRYPT_H_ #ifndef WITHOUT_CRYPTLIB -#include"cryptlib.h" +#include <cryptlib.h> #if CRYPTLIB_VERSION < 3400 #define CRYPT_ATTRIBUTE_ERRORMESSAGE CRYPT_ATTRIBUTE_INT_ERRORMESSAGE #endif -- GitLab