From bcc2fa1971fb61cb7210651188c1412c778f21fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= <nefarius@dhmx.at>
Date: Thu, 10 Feb 2022 12:21:39 +0100
Subject: [PATCH] Added environment variable to DMF Fixed docs

---
 DMF/DMF.props | 9 ++++++---
 DMF/README.md | 4 +++-
 UDE/README.md | 2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/DMF/DMF.props b/DMF/DMF.props
index 7c02703..3adde7d 100644
--- a/DMF/DMF.props
+++ b/DMF/DMF.props
@@ -4,14 +4,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_PropertySheetDisplayName>Driver Module Framework</_PropertySheetDisplayName>
+    <DmfRootPath Condition="'$(DmfRootPath)' == ''">
+      ..\..\DMF
+    </DmfRootPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\DMF\DMF\Modules.Library;..\..\DMF\DMF\Framework;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(DmfRootPath)\DMF\Modules.Library;$(DmfRootPath)\DMF\Framework;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies Condition="'$(DriverType)'=='KMDF'">..\..\DMF\$(Configuration)\$(PlatformName)\lib\DmfK\DmfK.lib;%(AdditionalDependencies);</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(DriverType)'!='KMDF'">..\..\DMF\$(Configuration)\$(PlatformName)\lib\DmfU\DmfU.lib;%(AdditionalDependencies);</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(DriverType)'=='KMDF'">$(DmfRootPath)\$(Configuration)\$(PlatformName)\lib\DmfK\DmfK.lib;%(AdditionalDependencies);</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(DriverType)'!='KMDF'">$(DmfRootPath)\$(Configuration)\$(PlatformName)\lib\DmfU\DmfU.lib;%(AdditionalDependencies);</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/DMF/README.md b/DMF/README.md
index 84190f4..7523827 100644
--- a/DMF/README.md
+++ b/DMF/README.md
@@ -2,7 +2,7 @@
 
 ## Usage
 
-To include and link against [DMF](https://github.com/microsoft/DMF) simply clone DMF to the same project parent directory and add the following snippet to your driver project:
+To include and link against [DMF](https://github.com/microsoft/DMF) simply clone DMF to the same project parent directory **or** set the environment variable `DmfRootPath` to the DMF directory. Then add the following snippet to your driver project:
 
 ```xml
   <ImportGroup Label="PropertySheets">
@@ -10,4 +10,6 @@ To include and link against [DMF](https://github.com/microsoft/DMF) simply clone
   </ImportGroup>
 ```
 
+**Important:** if a `PropertySheets` group already exists, append the Import-Node(s) to that to avoid linker issues!
+
 Drop the provided `DMF.props` into the project directory and all include and linker settings will be available. Works for both `KMDF` and `UMDF`.
diff --git a/UDE/README.md b/UDE/README.md
index 76eed70..e415a80 100644
--- a/UDE/README.md
+++ b/UDE/README.md
@@ -10,4 +10,6 @@ To include and link against [UDE](https://docs.microsoft.com/en-us/windows-hardw
   </ImportGroup>
 ```
 
+**Important:** if a `PropertySheets` group already exists, append the Import-Node(s) to that to avoid linker issues!
+
 Drop the provided `UDE.props` into the project directory and all include and linker settings will be available. Works for `KMDF` only.