Repairs condition when Yara-X isn't availab.e #132

Author: travisgoodspeed

CMakeLists.txt

@@ -28,12 +28,12 @@ find_package(Qt6 REQUIRED COMPONENTS Widgets LinguistTools Charts PrintSupport C
 
 
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(YARAX REQUIRED IMPORTED_TARGET yara_x_capi)
+pkg_check_modules(YARAX IMPORTED_TARGET yara_x_capi)
 
 
 # Check if the library was found
 if (YARAX_FOUND)
-    set(YARAX ${YARAX_STATIC_LIBRARIES} )
+    set(YARAX PkgConfig::YARAX )
     message(STATUS "Found yarax: ${YARAX}")
 else()
     message(STATUS "Yarax not found.  Will build without it.")
@@ -162,7 +162,7 @@ qt_add_executable(maskromtool
 qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
 target_link_libraries(maskromtool PRIVATE Qt6::Widgets
         Qt6::Charts Qt6::PrintSupport
-        libgoodasm ${READLINE} PkgConfig::YARAX)
+        libgoodasm ${READLINE} ${YARAX_LIBRARIES})
 
 
 set_target_properties(maskromtool PROPERTIES

gatograderyarax.cpp

@@ -12,7 +12,7 @@
  * with or without YaraX.
  */
 
-#ifdef YARAX_FOUND
+#if YARAX_FOUND==1
 
 GatoGraderYaraX::GatoGraderYaraX(QString rule) {
     //Someday we might hold more than one rule.

gatograderyarax.h

@@ -15,7 +15,7 @@
 #include "gatosolver.h"
 #include "config.h"     //Needed for "YARAX_FOUND" from Cmake.
 
-#ifdef YARAX_FOUND
+#if YARAX_FOUND==1
 
 //Library is C, not C++, so name mangling must be disabled.
 extern "C" {

gatomain.cpp

@@ -437,7 +437,7 @@ int main(int argc, char *argv[]) {
             }else if(parser.isSet(solveyaraOption)){
                 grader=new GatoGraderYara(yararule);
             }else if(parser.isSet(solveyaraxOption)){
-#ifdef YARAX_FOUND
+#if YARAX_FOUND==1
                 QFile source(yaraxrule);
                 source.open(QFile::ReadOnly);
                 grader=new GatoGraderYaraX(source.readAll());