From 2343992fcbe8b436da6df888be37713cccaff0ab Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Sat, 15 Jun 2024 18:07:04 +0300 Subject: [PATCH] CMake: Rename MICROLZMA_ENCODER/DECODER to XZ_MICROLZMA_ENCODER/DECODER --- CMakeLists.txt | 8 ++++---- tests/tests.cmake | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a87694f..0941a330 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -934,13 +934,13 @@ endforeach() # MicroLZMA # ############# -option(MICROLZMA_ENCODER +option(XZ_MICROLZMA_ENCODER "MicroLZMA encoder (needed by specific applications only)" ON) -option(MICROLZMA_DECODER +option(XZ_MICROLZMA_DECODER "MicroLZMA decoder (needed by specific applications only)" ON) -if(MICROLZMA_ENCODER) +if(XZ_MICROLZMA_ENCODER) if(NOT "lzma1" IN_LIST ENCODERS) message(FATAL_ERROR "The LZMA1 encoder is required to support the " "MicroLZMA encoder") @@ -949,7 +949,7 @@ if(MICROLZMA_ENCODER) target_sources(liblzma PRIVATE src/liblzma/common/microlzma_encoder.c) endif() -if(MICROLZMA_DECODER) +if(XZ_MICROLZMA_DECODER) if(NOT "lzma1" IN_LIST DECODERS) message(FATAL_ERROR "The LZMA1 decoder is required to support the " "MicroLZMA decoder") diff --git a/tests/tests.cmake b/tests/tests.cmake index 62c546ce..d8ba404f 100644 --- a/tests/tests.cmake +++ b/tests/tests.cmake @@ -40,7 +40,7 @@ if(BUILD_TESTING) # test_microlzma will fail to compile because this configuration is # not possible in the Autotools build, so the test was not made to # support it since it would have required additional changes. - if (MICROLZMA_ENCODER AND (MICROLZMA_DECODER + if (XZ_MICROLZMA_ENCODER AND (XZ_MICROLZMA_DECODER OR NOT "lzma1" IN_LIST DECODERS)) list(APPEND LIBLZMA_TESTS test_microlzma) endif()