From 523253aa13b9b8d188dfa5c2dd49dd17d99faf1b Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Mon, 8 Apr 2019 18:21:04 -0700
Subject: [PATCH 1/4] Added vhacd-util to all installers.

---
 tools/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index b9ae635a4f..a323dc46af 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -32,6 +32,7 @@ if (BUILD_TOOLS)
             skeleton-dump
             atp-client
             oven
+            vhacd-util
         )
     else()
         set(ALL_TOOLS 
@@ -45,6 +46,7 @@ if (BUILD_TOOLS)
             skeleton-dump
             atp-client
             oven
+            vhacd-util
             nitpick
         )
     endif()

From 781949da4c1ed3ec1af9764d021c0edc8d617372 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Mon, 8 Apr 2019 18:33:33 -0700
Subject: [PATCH 2/4] Added package_libraries_for_deployment.

---
 tools/CMakeLists.txt            | 12 +++++-------
 tools/vhacd-util/CMakeLists.txt |  4 +++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index a323dc46af..fd74786a5e 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -21,8 +21,8 @@ endfunction()
 if (BUILD_TOOLS)
     # Allow different tools for stable builds
     if (STABLE_BUILD)
-        set(ALL_TOOLS 
-            udt-test 
+        set(ALL_TOOLS
+            udt-test
             vhacd-util
             frame-optimizer
             gpu-frame-player
@@ -32,11 +32,10 @@ if (BUILD_TOOLS)
             skeleton-dump
             atp-client
             oven
-            vhacd-util
         )
     else()
-        set(ALL_TOOLS 
-            udt-test 
+        set(ALL_TOOLS
+            udt-test
             vhacd-util
             frame-optimizer
             gpu-frame-player
@@ -46,11 +45,10 @@ if (BUILD_TOOLS)
             skeleton-dump
             atp-client
             oven
-            vhacd-util
             nitpick
         )
     endif()
-    
+
     foreach(TOOL ${ALL_TOOLS})
         check_test(${TOOL})
         if (${BUILD_TOOL_RESULT})
diff --git a/tools/vhacd-util/CMakeLists.txt b/tools/vhacd-util/CMakeLists.txt
index 90cfdf878a..eccc496170 100644
--- a/tools/vhacd-util/CMakeLists.txt
+++ b/tools/vhacd-util/CMakeLists.txt
@@ -12,7 +12,9 @@ target_link_libraries(${TARGET_NAME} ${VHACD_LIBRARIES})
 
 setup_memory_debugger()
 
-if (UNIX AND NOT APPLE)
+if (WIN32)
+  package_libraries_for_deployment()
+elseif (UNIX AND NOT APPLE)
   include(FindOpenMP)
   if(OPENMP_FOUND)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")

From 13f0b97d07915b97cddbcc2a208a6167f5f07486 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Tue, 9 Apr 2019 10:40:04 -0700
Subject: [PATCH 3/4] Added install_beside_console

---
 tools/vhacd-util/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/vhacd-util/CMakeLists.txt b/tools/vhacd-util/CMakeLists.txt
index eccc496170..744e711694 100644
--- a/tools/vhacd-util/CMakeLists.txt
+++ b/tools/vhacd-util/CMakeLists.txt
@@ -22,3 +22,7 @@ elseif (UNIX AND NOT APPLE)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
   endif()
 endif ()
+
+if (BUILD_SERVER)
+  install_beside_console()
+endif ()

From 3e292c4b03f90940ad4b80d76fa098810ba8f2cc Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Tue, 9 Apr 2019 12:30:34 -0700
Subject: [PATCH 4/4] Install both oven and vhacd in both client and
 client+server builds.

---
 tools/oven/CMakeLists.txt       | 4 +---
 tools/vhacd-util/CMakeLists.txt | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/oven/CMakeLists.txt b/tools/oven/CMakeLists.txt
index c9b1aca1d4..86fee8a067 100644
--- a/tools/oven/CMakeLists.txt
+++ b/tools/oven/CMakeLists.txt
@@ -18,6 +18,4 @@ elseif (APPLE)
   set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
 endif()
 
-if (BUILD_SERVER)
-  install_beside_console()
-endif ()
+install_beside_console()
diff --git a/tools/vhacd-util/CMakeLists.txt b/tools/vhacd-util/CMakeLists.txt
index 744e711694..79e1fcb774 100644
--- a/tools/vhacd-util/CMakeLists.txt
+++ b/tools/vhacd-util/CMakeLists.txt
@@ -23,6 +23,4 @@ elseif (UNIX AND NOT APPLE)
   endif()
 endif ()
 
-if (BUILD_SERVER)
-  install_beside_console()
-endif ()
+install_beside_console()