From bcf6433b10a23d158db3923846d0d2b4dc6121f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B8=D1=84=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=90?= =?UTF-8?q?=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=90=D0=BD=D0=B0=D1=82=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B5=D0=B2=D0=B8=D1=87?= Date: Thu, 5 Sep 2024 15:19:38 +0500 Subject: [PATCH 1/3] New CMake option - CHCPP_EMBEDDED_BUILD --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b4ffc27..72243539 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,9 +7,11 @@ INCLUDE (subdirs) INCLUDE (openssl) INCLUDE (version) -OPTION (BUILD_BENCHMARK "Build benchmark" OFF) -OPTION (BUILD_TESTS "Build tests" OFF) -OPTION (BUILD_SHARED_LIBS "Build shared libs" OFF) +IF (NOT CHCPP_EMBEDDED_BUILD) + OPTION (BUILD_BENCHMARK "Build benchmark" OFF) + OPTION (BUILD_TESTS "Build tests" OFF) + OPTION (BUILD_SHARED_LIBS "Build shared libs" OFF) +ENDIF () OPTION (WITH_OPENSSL "Use OpenSSL for TLS connections" OFF) OPTION (WITH_SYSTEM_ABSEIL "Use system ABSEIL" OFF) OPTION (WITH_SYSTEM_LZ4 "Use system LZ4" OFF) From f87335afd959b52039b8ced37ad3aaae8e5bb3ee Mon Sep 17 00:00:00 2001 From: Andrey Alifanov Date: Mon, 9 Sep 2024 10:34:44 +0500 Subject: [PATCH 2/3] Another solution --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72243539..282eca60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,8 @@ INCLUDE (subdirs) INCLUDE (openssl) INCLUDE (version) -IF (NOT CHCPP_EMBEDDED_BUILD) +# use global flags only for standalone build +IF (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) OPTION (BUILD_BENCHMARK "Build benchmark" OFF) OPTION (BUILD_TESTS "Build tests" OFF) OPTION (BUILD_SHARED_LIBS "Build shared libs" OFF) From d53d6581d6aa959a183dc376cd34b9173b1539f8 Mon Sep 17 00:00:00 2001 From: Andrey Alifanov Date: Mon, 9 Sep 2024 10:48:18 +0500 Subject: [PATCH 3/3] Fix syntax --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 282eca60..2ae1ca04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ INCLUDE (openssl) INCLUDE (version) # use global flags only for standalone build -IF (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) +IF ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") OPTION (BUILD_BENCHMARK "Build benchmark" OFF) OPTION (BUILD_TESTS "Build tests" OFF) OPTION (BUILD_SHARED_LIBS "Build shared libs" OFF)