From 5309cda2767cd15b9f4b2a9a6e421dc714c00067 Mon Sep 17 00:00:00 2001 From: "Maxim [maxirmx] Samsonov" Date: Fri, 23 Jun 2023 17:42:48 +0300 Subject: [PATCH] S --- CMakeLists.txt | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37d6232364..3d511e9618 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,6 @@ option(ENABLE_COVERAGE "Enable code coverage testing.") option(ENABLE_SANITIZERS "Enable ASan and other sanitizers.") option(ENABLE_FUZZERS "Enable fuzz targets.") option(DOWNLOAD_GTEST "Download Googletest" On) -option(SYSTEM_LIBSEXP "Use system sexp library" OFF) # crypto components function(tristate_feature_auto NAME DESCRIPTION) @@ -184,18 +183,10 @@ if (ENABLE_FUZZERS) endif() add_subdirectory(src/common) -if (SYSTEM_LIBSEXP) - find_package(PkgConfig) - pkg_check_modules(REQUIRED sexp>=0.8.5) -else(SYSTEM_LIBSEXP) - set(WITH_SEXP_CLI OFF) - set(WITH_SEXP_TESTS OFF) - set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development) - set(SAVE_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) - set(BUILD_SHARED_LIBS OFF) - add_subdirectory(src/libsexp EXCLUDE_FROM_ALL) - set(BUILD_SHARED_LIBS ${SAVE_BUILD_SHARED_LIBS}) -endif(SYSTEM_LIBSEXP) +set(WITH_SEXP_CLI OFF) +set(WITH_SEXP_TESTS OFF) +set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development) +add_subdirectory(src/libsexp EXCLUDE_FROM_ALL) add_subdirectory(src/lib) add_subdirectory(src/rnp)