From 1d05fb39b52dab1487e5c7705c53823354f07480 Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Fri, 29 Dec 2023 01:19:52 +0100
Subject: [PATCH] fix WDEF and SystemExtension samples in Nix build

the nix build currently puts the REZ_INCLUDE_PATH in an environment variable rather than CMake, so REZ_INCLUDE_PATH is undefined in CMake
---
 Samples/SystemExtension/CMakeLists.txt | 6 +++++-
 Samples/WDEF/CMakeLists.txt            | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Samples/SystemExtension/CMakeLists.txt b/Samples/SystemExtension/CMakeLists.txt
index d3593c8984..c8bcf6a2b7 100644
--- a/Samples/SystemExtension/CMakeLists.txt
+++ b/Samples/SystemExtension/CMakeLists.txt
@@ -46,10 +46,14 @@ set_target_properties(SystemExtension PROPERTIES
         # of code in a data file
     LINK_FLAGS -Wl,--mac-flat)
 
+if (REZ_INCLUDE_PATH)
+    set(REZ_INCLUDE_FLAG -I${REZ_INCLUDE_PATH})
+endif()
+
     # Use Rez to put it together
 add_custom_command(
     OUTPUT SystemExtension.bin SystemExtension.dsk
-    COMMAND ${REZ} -I ${REZ_INCLUDE_PATH}
+    COMMAND ${REZ} ${REZ_INCLUDE_FLAG}
                     ${CMAKE_CURRENT_SOURCE_DIR}/SystemExtension.r
                     --copy ${CMAKE_CURRENT_SOURCE_DIR}/Icons.rsrc.bin
                     -o SystemExtension.bin
diff --git a/Samples/WDEF/CMakeLists.txt b/Samples/WDEF/CMakeLists.txt
index 1397e640cb..67477a0864 100644
--- a/Samples/WDEF/CMakeLists.txt
+++ b/Samples/WDEF/CMakeLists.txt
@@ -67,10 +67,14 @@ elseif(CMAKE_SYSTEM_NAME MATCHES RetroPPC)
     set(WDEF_RESOURCE WDEF.pef)
 endif()
 
+if (REZ_INCLUDE_PATH)
+    set(REZ_INCLUDE_FLAG -I${REZ_INCLUDE_PATH})
+endif()
+
     # wrap the compiled WDEF into a resource
 add_custom_command(
     OUTPUT WDEF.rsrc.bin
-    COMMAND ${REZ} -I ${REZ_INCLUDE_PATH}
+    COMMAND ${REZ} ${REZ_INCLUDE_FLAG}
                     ${CMAKE_CURRENT_SOURCE_DIR}/${WDEF_R}
                     -o WDEF.rsrc.bin