From 43ba3814968bb7ca73856b5fb77ff4706f1e771f Mon Sep 17 00:00:00 2001 From: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com> Date: Tue, 3 Nov 2020 11:41:12 +0300 Subject: [PATCH] =?UTF-8?q?SYNERGY-316=20Requires=20google=20test=20even?= =?UTF-8?q?=20when=20tests=20are=20disabled=20with=20BUI=E2=80=A6=20(#6825?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * SYNERGY-316 Requires googletest even when tests are disabled with BUILD_TESTS=OFF * Update ChangeLog --- CMakeLists.txt | 2 +- ChangeLog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a1ff16aa..f5647f26c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -350,7 +350,7 @@ endif() # # Google Test # -if(NOT EXISTS "${PROJECT_SOURCE_DIR}/ext/googletest/CMakeLists.txt") +if(BUILD_TESTS AND NOT EXISTS "${PROJECT_SOURCE_DIR}/ext/googletest/CMakeLists.txt") message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.") endif() diff --git a/ChangeLog b/ChangeLog index 5d9232f5c..2613a021e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ Bug fixes: - #6814 The system asks to save twice. - #6817 Configure requires dns_sd.h for enterprise version - #6821 Blocker bugs found by sonar +- #6825 The system requires google test even when tests are disabled with BUILD_TESTS=OFF Enhancements: - #6750 Integrate SonarCloud for static analysis and test coverage