diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2023-04-06 11:59:00 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2023-04-06 11:59:00 +0300 |
| commit | 589fb0e3aa15683cc71931da95b328e57a9c58b6 (patch) | |
| tree | abeb57a086e31f7b755060b1157301015ac1ced9 | |
| parent | f8ee4a17f770ad21e2ff032bd1eab27d6f808b11 (diff) | |
| download | rpm-589fb0e3aa15683cc71931da95b328e57a9c58b6.tar.gz | |
Revert "Handle IMA as an imported target"
This has brainfarts and is broken.
This reverts commit 7184fb80137363e39d79e2b5a0eb2c4fb060cc2e.
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | sign/CMakeLists.txt | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 234eaf22c..2b3cc9e21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,12 +196,6 @@ if (WITH_IMAEVM) list(APPEND REQFUNCS lsetxattr) find_path(IMA_INCLUDE_DIR NAMES imaevm.h REQUIRED) find_library(IMA_LIBRARY NAMES imaevm REQUIRED) - - add_library(IMA::IMA UNKNOWN IMPORTED) - set_target_properties(IMA::IMA PROPERTIES - IMPORTED_LOCATION "${IMA_LIBRARY}" - INTERFACE "${IMA_HEADER}" - ) endif() find_program(__FIND_DEBUGINFO find-debuginfo) diff --git a/sign/CMakeLists.txt b/sign/CMakeLists.txt index 854cef1a6..ff3270b97 100644 --- a/sign/CMakeLists.txt +++ b/sign/CMakeLists.txt @@ -8,7 +8,8 @@ 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::IMA) + target_link_libraries(librpmsign PRIVATE ${IMA_LIBRARY}) + target_include_directories(librpmsign PRIVATE ${IMA_INCLUDE_DIR}) endif() if (WITH_FSVERITY) target_sources(librpmsign PRIVATE rpmsignverity.c) |