mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-12 23:06:40 +02:00
120a747aea
https://www.libelektra.org A universal and secure framework to access configuration parameters
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From c93b4175480f7ded03e43b17108fed5434263069 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rene=CC=81=20Schwaiger?= <sanssecours@me.com>
|
|
Date: Thu, 28 Dec 2017 12:17:08 +0100
|
|
Subject: [PATCH] Augeas: Fix internal inconsistency
|
|
|
|
Patch-Source: https://github.com/ElektraInitiative/libelektra/pull/1761
|
|
---
|
|
src/plugins/augeas/CMakeLists.txt | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/plugins/augeas/CMakeLists.txt b/src/plugins/augeas/CMakeLists.txt
|
|
index b4c9c7c15b..dc29fa8642 100644
|
|
--- a/src/plugins/augeas/CMakeLists.txt
|
|
+++ b/src/plugins/augeas/CMakeLists.txt
|
|
@@ -23,6 +23,9 @@ if (DEPENDENCY_PHASE)
|
|
else (LIBAUGEAS_FOUND)
|
|
remove_plugin (augeas "libaugeas not found (libaugeas-dev >= 0.16 needed)")
|
|
endif ()
|
|
+
|
|
+ set (AUGEAS_PLUGIN_INCLUDE_DIRS ${LIBAUGEAS_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
|
|
+ set (AUGEAS_PLUGIN_LIBRARIES ${LIBAUGEAS_LIBRARIES} ${LIBXML2_LIBRARIES})
|
|
endif ()
|
|
|
|
add_plugin(augeas
|
|
@@ -32,16 +35,14 @@ add_plugin(augeas
|
|
ADD_TEST
|
|
INSTALL_TEST_DATA
|
|
INCLUDE_DIRECTORIES
|
|
- ${LIBAUGEAS_INCLUDE_DIR}
|
|
- ${LIBXML2_INCLUDE_DIR}
|
|
+ ${AUGEAS_PLUGIN_INCLUDE_DIRS}
|
|
COMPILE_DEFINITIONS
|
|
"${LIBAUGEAS_COMPILE_DEFINITIONS}"
|
|
LINK_ELEKTRA
|
|
elektra-meta
|
|
elektra-proposal
|
|
LINK_LIBRARIES
|
|
- ${LIBAUGEAS_LIBRARIES}
|
|
- ${LIBXML2_LIBRARIES}
|
|
+ ${AUGEAS_PLUGIN_LIBRARIES}
|
|
)
|
|
|
|
if (ADDTESTING_PHASE)
|