diff options
| author | Michal Domonkos <mdomonko@redhat.com> | 2023-04-11 12:25:41 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2023-04-11 13:50:43 +0300 |
| commit | 909d237b5eddfbc43051f75d8f96688448026496 (patch) | |
| tree | 34ab999b80562923af5177432c1f78b532d3aaad | |
| parent | 62395521a9aea856c225de1baf767707ed235f98 (diff) | |
| download | rpm-909d237b5eddfbc43051f75d8f96688448026496.tar.gz | |
Handle IMA as an imported target, take II
Another attempt at commit 7184fb80137363e39d79e2b5a0eb2c4fb060cc2e.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | sign/CMakeLists.txt | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4db2bb824..7c5f5147a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,8 +202,12 @@ endif() if (WITH_IMAEVM) list(APPEND REQFUNCS lsetxattr) + add_library(IMA::IMA UNKNOWN IMPORTED) find_path(IMA_INCLUDE_DIR NAMES imaevm.h REQUIRED) find_library(IMA_LIBRARY NAMES imaevm REQUIRED) + set_target_properties(IMA::IMA PROPERTIES + IMPORTED_LOCATION "${IMA_LIBRARY}") + target_include_directories(IMA::IMA INTERFACE "${IMA_INCLUDE_DIR}") endif() find_program(__FIND_DEBUGINFO find-debuginfo) diff --git a/sign/CMakeLists.txt b/sign/CMakeLists.txt index ff3270b97..854cef1a6 100644 --- a/sign/CMakeLists.txt +++ b/sign/CMakeLists.txt @@ -8,8 +8,7 @@ target_sources(librpmsign PRIVATE rpmgensig.c) target_link_libraries(librpmsign PUBLIC librpmio librpm) if (WITH_IMAEVM) target_sources(librpmsign PRIVATE rpmsignfiles.c) - target_link_libraries(librpmsign PRIVATE ${IMA_LIBRARY}) - target_include_directories(librpmsign PRIVATE ${IMA_INCLUDE_DIR}) + target_link_libraries(librpmsign PRIVATE IMA::IMA) endif() if (WITH_FSVERITY) target_sources(librpmsign PRIVATE rpmsignverity.c) |