diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 1b7024d1f..ce318d2a4 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -44,7 +44,7 @@ jobs:
       env:
         CC: ${{ matrix.compiler.cc }}
         CXX: ${{ matrix.compiler.cxx }}
-      run: mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS="-Werror" ..
+      run: mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS="-Werror" -DBUILD_EXECUTABLE=ON ..
     - name: Build
       run: |
         echo "Build with $(nproc) thread(s)"
@@ -150,7 +150,7 @@ jobs:
           run: |
             cd /volk
             cd build
-            cmake -DCMAKE_CXX_FLAGS="-Werror" ..
+            cmake -DCMAKE_CXX_FLAGS="-Werror" -DBUILD_EXECUTABLE=ON ..
             echo "Build with $(nproc) thread(s)"
             make -j$(nproc)
             ./cpu_features/list_cpu_features
@@ -173,7 +173,7 @@ jobs:
     - name: dependencies
       run: sudo apt install python3-mako liborc-dev
     - name: configure
-      run: mkdir build && cd build && cmake -DENABLE_STATIC_LIBS=True ..
+      run: mkdir build && cd build && cmake -DENABLE_STATIC_LIBS=True -DBUILD_EXECUTABLE=ON ..
     - name: build
       run: cmake --build build -j$(nproc)
     - name: Print info
@@ -248,7 +248,7 @@ jobs:
     - name: dependencies
       run: pip3 install mako
     - name: configure
-      run: mkdir build && cd build && cmake ..
+      run: mkdir build && cd build && cmake -DBUILD_EXECUTABLE=ON ..
     - name: build
       run: cmake --build build --config Debug -j3
     - name: Print info
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92d5097fa..be1dd6ebc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,6 +144,7 @@ if (VOLK_CPU_FEATURES)
       FORCE)
     set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
     set(BUILD_SHARED_LIBS OFF)
+    set(ENABLE_INSTALL OFF)
     add_subdirectory(cpu_features)
     set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
   endif()
diff --git a/cpu_features b/cpu_features
index 41e206e43..ba4bffa86 160000
--- a/cpu_features
+++ b/cpu_features
@@ -1 +1 @@
-Subproject commit 41e206e435b3c84a6fdd937dfe2a07e8ee73e611
+Subproject commit ba4bffa86cbb5456bdb34426ad22b9551278e2c0
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index f2d6b7e7c..a27be22b4 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -521,15 +521,9 @@ target_include_directories(volk_obj
 )
 if(VOLK_CPU_FEATURES)
   set_source_files_properties(volk_cpu.c PROPERTIES COMPILE_DEFINITIONS "VOLK_CPU_FEATURES=1")
-  if(CpuFeatures_FOUND)
-    target_include_directories(volk_obj
-        PRIVATE $<TARGET_PROPERTY:CpuFeatures::cpu_features,INTERFACE_INCLUDE_DIRECTORIES>
-    )
-  else()
-    target_include_directories(volk_obj
-        PRIVATE $<TARGET_PROPERTY:cpu_features,INTERFACE_INCLUDE_DIRECTORIES>
-    )
-  endif()
+  target_include_directories(volk_obj
+      PRIVATE $<TARGET_PROPERTY:CpuFeatures::cpu_features,INTERFACE_INCLUDE_DIRECTORIES>
+  )
 endif()
 
 #Configure object target properties
@@ -548,7 +542,7 @@ endif()
 add_library(volk SHARED $<TARGET_OBJECTS:volk_obj>)
 target_link_libraries(volk PUBLIC ${volk_libraries})
 if(VOLK_CPU_FEATURES)
-  target_link_libraries(volk PRIVATE CpuFeature::cpu_features)
+  target_link_libraries(volk PRIVATE $<BUILD_INTERFACE:CpuFeatures::cpu_features>)
 endif()
 target_include_directories(volk
     PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
@@ -591,7 +585,7 @@ if(ENABLE_STATIC_LIBS)
   add_library(volk_static STATIC $<TARGET_OBJECTS:volk_obj>)
   target_link_libraries(volk_static PUBLIC ${volk_libraries})
   if(VOLK_CPU_FEATURES)
-    target_link_libraries(volk_static PRIVATE CpuFeature::cpu_features)
+    target_link_libraries(volk_static PRIVATE $<BUILD_INTERFACE:CpuFeatures::cpu_features>)
   endif()
   if(ORC_FOUND)
     target_link_libraries(volk_static PUBLIC ${ORC_LIBRARIES_STATIC})