diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt
index 0ef7757ad7..9e4a744473 100644
--- a/ApplicationCode/CMakeLists.txt
+++ b/ApplicationCode/CMakeLists.txt
@@ -357,6 +357,7 @@ set( EXE_FILES
     .clang-format
     .clang-tidy
     Adm/RiaVersionInfo.h.cmake
+    $<TARGET_OBJECTS:cafCommandFeatures> # Needed for cmake version < 3.12. Remove when we can use target_link_libraries with OBJECT libraries
 )
 
 if (RESINSIGHT_ENABLE_GRPC)
@@ -475,6 +476,7 @@ if(RESINSIGHT_ENABLE_COTIRE)
         # QT 5
         qrc_cafAnimControl.cpp
         qrc_ResInsight.cpp
+        qrc_cafCommandFeatures.cpp
         ProjectDataModel/RimContourMapView.cpp
         Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp
     )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 868f1a5757..088c7caca4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -375,6 +375,9 @@ add_subdirectory(Fwk/AppFwk/cafPdmCvf)
 add_subdirectory(Fwk/AppFwk/CommonCode)
 add_subdirectory(Fwk/AppFwk/cafVizExtensions)
 
+add_subdirectory(Fwk/AppFwk/cafCommandFeatures)
+set_property(TARGET cafCommandFeatures PROPERTY FOLDER "AppFwk")
+
 #add_subdirectory(Fwk/AppFwk/cafTests/cafTestCvfApplication)
 
 add_subdirectory(Fwk/AppFwk/cafTensor)
@@ -416,9 +419,6 @@ if (RESINSIGHT_INCLUDE_APPFWK_TESTS)
     set_property(TARGET cafPdmXml_UnitTests PROPERTY FOLDER "AppFwkTests")
 
     # Executables
-	add_subdirectory(Fwk/AppFwk/cafCommandFeatures)
-	set_property(TARGET cafCommandFeatures PROPERTY FOLDER "AppFwk")
-
     add_subdirectory(Fwk/AppFwk/cafTests/cafTestApplication)
     set_property(TARGET cafTestApplication PROPERTY FOLDER "AppFwkTests")
 endif()