From 27b2311e652b57592573dca9ec381219414de162 Mon Sep 17 00:00:00 2001
From: Mederic Fourmy <mederic.fourmy@gmail.com>
Date: Wed, 27 Apr 2022 13:16:56 +0200
Subject: [PATCH] Setting the PLUGIN_NAME var in cmake.in was overwriting the
global context PLUGIN_NAME var of child plugins, just use templace syntax
instead
---
cmake_modules/wolfcoreConfig.cmake.in | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/cmake_modules/wolfcoreConfig.cmake.in b/cmake_modules/wolfcoreConfig.cmake.in
index 42a17e6ca..2ddbaed54 100644
--- a/cmake_modules/wolfcoreConfig.cmake.in
+++ b/cmake_modules/wolfcoreConfig.cmake.in
@@ -1,13 +1,11 @@
-set(${PLUGIN_NAME}_VERSION 0.0.1)
+set(@PLUGIN_NAME@_VERSION 0.0.1)
-set(PLUGIN_NAME "@PLUGIN_NAME@")
-
@PACKAGE_INIT@
-set_and_check(${PLUGIN_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
-set(${PLUGIN_NAME}_INCLUDE_DIRS ${PLUGIN_NAME}_INCLUDE_DIR)
-set_and_check(${PLUGIN_NAME}_LIB_INSTALL_DIR "@PACKAGE_LIB_INSTALL_DIR@")
-set(${PLUGIN_NAME}_LIB_INSTALL_DIRS ${PLUGIN_NAME}_LIB_INSTALL_DIR)
+set_and_check(@PLUGIN_NAME@_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set(@PLUGIN_NAME@_INCLUDE_DIRS @PLUGIN_NAME@_INCLUDE_DIR)
+set_and_check(@PLUGIN_NAME@_LIB_INSTALL_DIR "@PACKAGE_LIB_INSTALL_DIR@")
+set(@PLUGIN_NAME@_LIB_INSTALL_DIRS @PLUGIN_NAME@_LIB_INSTALL_DIR)
-check_required_components(${PLUGIN_NAME})
\ No newline at end of file
+check_required_components(@PLUGIN_NAME@)
\ No newline at end of file
--
GitLab