diff --git a/CMakeModules/KPMcoreHelper.cmake b/CMakeModules/KPMcoreHelper.cmake
index d1bfec684..694ac13d6 100644
--- a/CMakeModules/KPMcoreHelper.cmake
+++ b/CMakeModules/KPMcoreHelper.cmake
@@ -34,13 +34,16 @@ if(NOT TARGET calapmcore)
         target_include_directories(calapmcore INTERFACE ${KPMCORE_INCLUDE_DIR})
         # If there were KPMcore API variations, figure them out here
         # target_compile_definitions(calapmcore INTERFACE WITH_KPMcore)
+        set_target_properties(calapmcore PROPERTIES KPMcore_FOUND TRUE)
     else()
         target_compile_definitions(calapmcore INTERFACE WITHOUT_KPMcore)
+        set_target_properties(calapmcore PROPERTIES KPMcore_FOUND FALSE)
     endif()
 
     add_library(calamares::kpmcore ALIAS calapmcore)
 else()
-    if(TARGET kpmcore)
+    get_target_property(KPMcore_FOUND calapmcore KPMcore_FOUND)
+    if(KPMcore_FOUND)
         message(STATUS "KPMcore has already been found")
         set(KPMcore_FOUND TRUE)
     else()