From 4d753badc09cca1a85c4fb7f404bae2d6ed51f5f Mon Sep 17 00:00:00 2001 From: Don Date: Wed, 21 Mar 2018 11:33:38 -0700 Subject: Cleanup options around tests --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b708f07..2873f12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,10 +29,10 @@ string(REGEX REPLACE "\\..*" "" TLS_MAJOR_VERSION ${TLS_VERSION}) option(LIBRESSL_SKIP_INSTALL "Skip installation" ${LIBRESSL_SKIP_INSTALL}) option(LIBRESSL_APPS "Build apps" ON) +option(LIBRESSL_TESTS "Build tests" ON) option(ENABLE_ASM "Enable assembly" ON) option(ENABLE_EXTRATESTS "Enable extra tests that may be unreliable on some platforms" OFF) option(ENABLE_NC "Enable installing TLS-enabled nc(1)" OFF) -option(ENABLE_VSTEST "Enable test on Visual Studio" OFF) set(OPENSSLDIR ${OPENSSLDIR} CACHE PATH "Set the default openssl directory" FORCE) if(NOT LIBRESSL_SKIP_INSTALL) @@ -300,7 +300,8 @@ add_subdirectory(include) if(NOT MSVC) add_subdirectory(man) endif() -if(NOT MSVC OR ENABLE_VSTEST) +# Tests require the openssl executable and are unavailable when building shared libraries +if(LIBRESSL_APPS AND LIBRESSL_TESTS AND NOT BUILD_SHARED_LIBS) add_subdirectory(tests) endif() -- cgit v1.2.3-55-g6feb