napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: target kpmcore doesn't exist elsewhere, so check was failing

Browse Source 
Consumers of calapmcode couldn't tell if KPMcore was found.
Pass it around as a property of calapmcore, rather than
anything else.

FIXES #2026
This commit is contained in:
Adriaan de Groot 2022-06-28 00:12:33 +02:00
parent f42f2514cb
commit 0688c7f4e7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeModules/KPMcoreHelper.cmake
View File

@ -34,13 +34,16 @@ if(NOT TARGET calapmcore)
target_include_directories(calapmcore INTERFACE ${KPMCORE_INCLUDE_DIR}) target_include_directories(calapmcore INTERFACE ${KPMCORE_INCLUDE_DIR})
# If there were KPMcore API variations, figure them out here # If there were KPMcore API variations, figure them out here
# target_compile_definitions(calapmcore INTERFACE WITH_KPMcore) # target_compile_definitions(calapmcore INTERFACE WITH_KPMcore)
set_target_properties(calapmcore PROPERTIES KPMcore_FOUND TRUE)
else() else()
target_compile_definitions(calapmcore INTERFACE WITHOUT_KPMcore) target_compile_definitions(calapmcore INTERFACE WITHOUT_KPMcore)
set_target_properties(calapmcore PROPERTIES KPMcore_FOUND FALSE)
endif() endif()
add_library(calamares::kpmcore ALIAS calapmcore) add_library(calamares::kpmcore ALIAS calapmcore)
else() else()
if(TARGET kpmcore) get_target_property(KPMcore_FOUND calapmcore KPMcore_FOUND)
if(KPMcore_FOUND)
message(STATUS "KPMcore has already been found") message(STATUS "KPMcore has already been found")
set(KPMcore_FOUND TRUE) set(KPMcore_FOUND TRUE)
else() else()