cmake: fix detection of kvazaar struct member (#990)

strukturag · Oct 16, 2023 · ef7a6eb · ef7a6eb
1 parent 09d11e2
commit ef7a6eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -112,10 +112,12 @@ endif()
 plugin_option(KVAZAAR "kvazaar HEVC encoder" OFF OFF)
 if (WITH_KVAZAAR)
     find_package(kvazaar)
-    if (HAVE_KVAZAAR_ENABLE_LOGGING)
+    if ("${HAVE_KVAZAAR_ENABLE_LOGGING}")
         add_definitions(-DHAVE_KVAZAAR_ENABLE_LOGGING=1)
+        message("HAVE KV")
     else ()
         add_definitions(-DHAVE_KVAZAAR_ENABLE_LOGGING=0)
+        message("DONT HAVE KV")
     endif ()
 endif ()
 

diff --git a/cmake/modules/Findkvazaar.cmake b/cmake/modules/Findkvazaar.cmake
@@ -18,9 +18,10 @@ set(KVAZAAR_PROCESS_LIBS KVAZAAR_LIBRARY)
 set(KVAZAAR_PROCESS_INCLUDES KVAZAAR_INCLUDE_DIR)
 libfind_process(KVAZAAR)
 
+set(CMAKE_REQUIRED_INCLUDES ${KVAZAAR_INCLUDE_DIR})
 CHECK_STRUCT_HAS_MEMBER("struct kvz_config" enable_logging_output kvazaar.h
                         HAVE_KVAZAAR_ENABLE_LOGGING LANGUAGE CXX)
-set(HAVE_KVAZAAR_ENABLE_LOGGING HAVE_KVAZAAR_ENABLE_LOGGING)
+unset(CMAKE_REQUIRED_INCLUDES)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(kvazaar