From 5a98245ddfd8af498ebd2e3445e396a76a8097ab Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Mon, 28 Oct 2024 18:06:20 -0400
Subject: [PATCH] build: rm DESKFLOW_RES_DIR define

---
 cmake/Definitions.cmake        | 7 +------
 deploy/dist/wix/Include.wxi.in | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake
index f1830dce8..48df28b02 100644
--- a/cmake/Definitions.cmake
+++ b/cmake/Definitions.cmake
@@ -54,10 +54,6 @@ endmacro()
 
 macro(configure_meta)
 
-  set(DESKFLOW_DEPLOY_RES_DIR
-      "${PROJECT_SOURCE_DIR}/deploy"
-      CACHE STRING "Deploy resource directory for images, etc")
-
   set(DESKFLOW_MAC_BUNDLE_CODE
       "DFLW"
       CACHE STRING "Mac bundle code (4 characters)")
@@ -66,11 +62,10 @@ macro(configure_meta)
       true
       CACHE BOOL "Show developer thanks message")
 
-  message(VERBOSE "Res dir: ${DESKFLOW_DEPLOY_RES_DIR}")
+  # TODO: We need to move this to configure_file() in the future, which is much cleaner.
   message(VERBOSE "Mac bundle code: ${DESKFLOW_MAC_BUNDLE_CODE}")
   message(VERBOSE "Show dev thanks: ${DESKFLOW_SHOW_DEV_THANKS}")
 
-  # TODO: We need to move this to configure_file() in the future, which is much cleaner.
   if(DESKFLOW_SHOW_DEV_THANKS)
     message(VERBOSE "Showing developer thanks message")
     add_definitions(-DDESKFLOW_SHOW_DEV_THANKS)
diff --git a/deploy/dist/wix/Include.wxi.in b/deploy/dist/wix/Include.wxi.in
index 2e3d581de..4fceaed3c 100644
--- a/deploy/dist/wix/Include.wxi.in
+++ b/deploy/dist/wix/Include.wxi.in
@@ -6,7 +6,7 @@
     <?define Author="Deskflow"?>
     <?define BinDir="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"?>
     <?define ProjectIcon="@CMAKE_SOURCE_DIR@/src/gui/src/deskflow.ico"?>
-    <?define DeployResDir="@DESKFLOW_DEPLOY_RES_DIR@"?>
+    <?define DeployResDir="@CMAKE_SOURCE_DIR@/deploy"?>
     <?define QtDir="@QT_PATH@"?>
     <?define QtBinDir="$(var.QtDir)\bin"?>
     <?if $(var.Platform) = "x64"?>