From 7eb93f47777701f670cc501865f7dd170a5ca915 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 5 Dec 2017 08:46:50 -0800
Subject: [PATCH] Add oven as dep to assignment-client

---
 assignment-client/CMakeLists.txt               | 18 +++++++++++++++++-
 assignment-client/src/assets/BakeAssetTask.cpp |  4 +---
 tools/oven/CMakeLists.txt                      |  2 ++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index 0421195612..8e35186bd0 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -13,9 +13,25 @@ setup_memory_debugger()
 link_hifi_libraries(
   audio avatars octree gpu model fbx entities
   networking animation recording shared script-engine embedded-webserver
-  controllers physics plugins midi baking image
+  controllers physics plugins midi image baking
 )
 
+add_dependencies(${TARGET_NAME} oven)
+
+if (WIN32)
+  add_custom_command(
+    TARGET ${TARGET_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+            $<TARGET_FILE_DIR:oven>
+            $<TARGET_FILE_DIR:${TARGET_NAME}>)
+else()
+  add_custom_command(
+    TARGET ${TARGET_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E create_symlink
+            $<TARGET_FILE:oven>
+            $<TARGET_FILE_DIR:${TARGET_NAME}>/oven)
+endif()
+
 if (WIN32)
   package_libraries_for_deployment()
 endif()
diff --git a/assignment-client/src/assets/BakeAssetTask.cpp b/assignment-client/src/assets/BakeAssetTask.cpp
index ca96a0d36c..bb0c344a1f 100644
--- a/assignment-client/src/assets/BakeAssetTask.cpp
+++ b/assignment-client/src/assets/BakeAssetTask.cpp
@@ -53,9 +53,7 @@ void BakeAssetTask::run() {
     QString tempOutputDir = PathUtils::generateTemporaryDir();
     _outputDir = tempOutputDir;
     auto base = QFileInfo(QCoreApplication::applicationFilePath()).absoluteDir();
-    QString path = base.absolutePath() + "/../../tools/oven/RelWithDebInfo/oven.exe";
-    path = base.absolutePath() + "/../tools/oven/oven";
-    //path = "C:/Users/huffm/dev/hifi/build17/tools/oven/RelWithDebInfo/oven.exe"; 
+    QString path = base.absolutePath() + "/oven";
     QString extension = _assetPath.mid(_assetPath.lastIndexOf('.') + 1);
     QStringList args {
         "-i", _filePath,
diff --git a/tools/oven/CMakeLists.txt b/tools/oven/CMakeLists.txt
index fd027c40fe..5f8f2c9542 100644
--- a/tools/oven/CMakeLists.txt
+++ b/tools/oven/CMakeLists.txt
@@ -18,3 +18,5 @@ if (UNIX)
 endif ()
 
 set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL FALSE EXCLUDE_FROM_DEFAULT_BUILD FALSE)
+
+install_beside_console()