cmake: fix detection of AOM flag availability (#989)

strukturag · Oct 16, 2023 · e7d8563 · e7d8563
1 parent 963f7bf
commit e7d8563
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -183,8 +183,8 @@ plugin_compilation_info(LIBDE265 LIBDE265 "libde265 HEVC decoder")
 plugin_compilation_info(FFMPEG_DECODER FFMPEG_avcodec "FFMPEG HEVC decoder (HW acc)")
 plugin_compilation_info(X265 X265 "x265 HEVC encoder")
 plugin_compilation_info(KVAZAAR KVAZAAR "Kvazaar HEVC encoder")
-plugin_compilation_info(AOM_DECODER AOM "AOM AV1 decoder")
-plugin_compilation_info(AOM_ENCODER AOM "AOM AV1 encoder")
+plugin_compilation_info(AOM_DECODER AOM_DECODER "AOM AV1 decoder")
+plugin_compilation_info(AOM_ENCODER AOM_ENCODER "AOM AV1 encoder")
 plugin_compilation_info(DAV1D DAV1D "Dav1d AV1 decoder")
 plugin_compilation_info(SvtEnc SvtEnc "SVT AV1 encoder")
 plugin_compilation_info(RAV1E RAV1E "Rav1e AV1 encoder")

diff --git a/cmake/modules/FindAOM.cmake b/cmake/modules/FindAOM.cmake
@@ -22,7 +22,7 @@ else()
     set(AOM_DECODER_FOUND NO)
 endif()
 
-if((EXISTS "${AOM_INCLUDE_DIR}/aom/aom_encoder.h") AND (DEFINED aom_usage_flag_exists))
+if((EXISTS "${AOM_INCLUDE_DIR}/aom/aom_encoder.h") AND "${aom_usage_flag_exists}")
     set(AOM_ENCODER_FOUND YES)
 else()
     set(AOM_ENCODER_FOUND NO)

diff --git a/libheif/plugins/CMakeLists.txt b/libheif/plugins/CMakeLists.txt
@@ -53,11 +53,11 @@ plugin_compilation(dav1d DAV1D DAV1D DAV1D)
 
 set(AOM_DECODER_sources decoder_aom.cc decoder_aom.h)
 set(AOM_DECODER_extra_plugin_sources)
-plugin_compilation(aomdec AOM AOM_DECODER AOM_DECODER)
+plugin_compilation(aomdec AOM_DECODER AOM_DECODER AOM_DECODER)
 
 set(AOM_ENCODER_sources encoder_aom.cc encoder_aom.h)
 set(AOM_ENCODER_extra_plugin_sources ../error.cc ../common_utils.cc ../common_utils.h)
-plugin_compilation(aomenc AOM AOM_ENCODER AOM_ENCODER)
+plugin_compilation(aomenc AOM_ENCODER AOM_ENCODER AOM_ENCODER)
 
 set(SvtEnc_sources encoder_svt.cc encoder_svt.h)
 set(SvtEnc_extra_plugin_sources)