@@ -413,14 +413,6 @@ on Windows, you may need to use the following options...

 ##### libpcre2

-Hints to find libcpre2 package:

-

-```sh

-  -DPCRE2_DIR="_path to libpcre2 install root_"

-```

-

-Or, explicitly set header & library paths:

-

 ```sh

   -DPCRE2_INCLUDE_DIR="_filepath of libpcre2 header directory_"

   -DPCRE2_LIBRARY="_filepath of libcpre2 library_"

@@ -43,6 +43,7 @@ set_target_properties(regex PROPERTIES

     COMPILE_FLAGS "${WARNCFLAGS}")

 target_link_libraries( regex

     PRIVATE

+        PCRE2::pcre2

         JSONC::jsonc )

 add_library( lzma_sdk OBJECT )

@@ -99,6 +100,7 @@ set_target_properties(lzma_sdk PROPERTIES

     COMPILE_FLAGS "${WARNCFLAGS}")

 target_link_libraries( lzma_sdk

     PRIVATE

+        PCRE2::pcre2

         JSONC::jsonc )

 bison_target( yara_grammar

@@ -135,6 +137,7 @@ set_target_properties(yara PROPERTIES

     COMPILE_FLAGS "${WARNCFLAGS}")

 target_link_libraries( yara

     PRIVATE

+        PCRE2::pcre2

         JSONC::jsonc )

 add_library( tomsfastmath OBJECT )

@@ -230,6 +233,35 @@ target_include_directories( tomsfastmath

 set_target_properties(tomsfastmath PROPERTIES

     COMPILE_FLAGS "${WARNCFLAGS}")

+# Bytecode Runtime

+add_library( bytecode_runtime OBJECT )

+if(LLVM_FOUND)

+    target_sources( bytecode_runtime

+        PRIVATE

+            c++/detect.cpp

+            c++/ClamBCRTChecks.cpp

+            c++/bytecode2llvm.cpp

+            bytecode_priv.h

+            bytecode.h )

+    set_target_properties(bytecode_runtime PROPERTIES

+        COMPILE_FLAGS "${WARNCXXFLAGS} ${CXX1XCXXFLAGS}")

+else()

+    target_sources( bytecode_runtime

+        PRIVATE

+            bytecode_nojit.c

+            bytecode_priv.h

+            bytecode.h )

+    set_target_properties(bytecode_runtime PROPERTIES

+        COMPILE_FLAGS "${WARNCFLAGS}")

+endif()

+target_include_directories( bytecode_runtime

+    PRIVATE ${CMAKE_BINARY_DIR}

+    PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR} )

+target_link_libraries( bytecode_runtime

+    PRIVATE

+        PCRE2::pcre2

+        JSONC::jsonc )

+

 # clamav clamav_obj

 add_library( clamav_obj OBJECT )

 target_sources( clamav_obj

@@ -446,34 +478,6 @@ if(WIN32)

     target_sources( clamav_obj PRIVATE libclamav_main.c )

 endif()

-# Bytecode Runtime

-add_library( bytecode_runtime OBJECT )

-if(LLVM_FOUND)

-    target_sources( bytecode_runtime

-        PRIVATE

-            c++/detect.cpp

-            c++/ClamBCRTChecks.cpp

-            c++/bytecode2llvm.cpp

-            bytecode_priv.h

-            bytecode.h )

-    set_target_properties(bytecode_runtime PROPERTIES

-        COMPILE_FLAGS "${WARNCXXFLAGS} ${CXX1XCXXFLAGS}")

-else()

-    target_sources( bytecode_runtime

-        PRIVATE

-            bytecode_nojit.c

-            bytecode_priv.h

-            bytecode.h )

-    set_target_properties(bytecode_runtime PROPERTIES

-        COMPILE_FLAGS "${WARNCFLAGS}")

-endif()

-target_include_directories( bytecode_runtime

-    PRIVATE ${CMAKE_BINARY_DIR}

-    PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR} )

-target_link_libraries( bytecode_runtime

-    PRIVATE

-        JSONC::jsonc )

-

 target_include_directories( clamav_obj

     PRIVATE   ${CMAKE_BINARY_DIR} ${JSONC_INCLUDE_DIRS}

     PUBLIC    ${CMAKE_CURRENT_SOURCE_DIR}