From b7db65f03581cb95799410fa60044b9178c27db6 Mon Sep 17 00:00:00 2001
From: Ratchanan Srirattanamet <ratchanan@ubports.com>
Date: Thu, 14 Dec 2023 04:16:34 +0700
Subject: Remove ENABLE_LOMIRI_FEATURES CMake flag

There's no longer any Lomiri-specific code in this repo, so remove the
flag.

The unit test actually works without the flag, so do include it without
the condition.
---
 .build.yml           | 2 +-
 CMakeLists.txt       | 2 --
 tests/CMakeLists.txt | 4 +---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.build.yml b/.build.yml
index 8c6db80..fc9c4fd 100644
--- a/.build.yml
+++ b/.build.yml
@@ -174,7 +174,7 @@ build_scripts:
   -
   - if [ -e ./CMakeLists.txt ]; then
   -     if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then
-  -         scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -DENABLE_TESTS=ON -DENABLE_LOMIRI_FEATURES=ON
+  -         scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -DENABLE_TESTS=ON
   -     else
   -         scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON
   -     fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86ee3ad..20d3521 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,6 @@ set(SERVICE_EXEC "${PACKAGE}-service")
 option(ENABLE_TESTS "Enable all tests and checks" OFF)
 option(ENABLE_COVERAGE "Enable coverage reports (includes enabling all tests and checks)" OFF)
 option(ENABLE_WERROR "Treat all build warnings as errors" OFF)
-option(ENABLE_LOMIRI_FEATURES "Build with Lomiri-specific libraries, schemas and media" OFF)
 option(ENABLE_COLOR_TEMP "Include colour temperature specific code in the build" ON)
 
 if(ENABLE_COVERAGE)
@@ -117,5 +116,4 @@ endif()
 message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}")
 message(STATUS "Unit tests: ${ENABLE_TESTS}")
 message(STATUS "Build with -Werror: ${ENABLE_WERROR}")
-message(STATUS "Build with Lomiri features: ${ENABLE_LOMIRI_FEATURES}")
 message(STATUS "Build with colour temperature code: ${ENABLE_COLOR_TEMP}")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3ce7fa3..81e083c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -30,9 +30,7 @@ add_compile_options(${CXX_WARNING_ARGS})
 
 add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=unusedFunction --suppress=uselessOverride)
 
-if (ENABLE_LOMIRI_FEATURES)
-    add_subdirectory (unit)
-endif ()
+add_subdirectory (unit)
 
 set(COVERAGE_TEST_TARGETS
   ${COVERAGE_TEST_TARGETS}
-- 
cgit v1.2.3