Merge pull request #15356 from NissimHadar/22096-addVHACDUtilToInstaller

Case 22096: Added vhacd-util and Oven to all installers.

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
@@ -34,8 +34,8 @@ if (BUILD_TOOLS)
             oven
         )
     else()
-        set(ALL_TOOLS 
-            udt-test 
+        set(ALL_TOOLS
+            udt-test
             vhacd-util
             frame-optimizer
             gpu-frame-player
@@ -48,7 +48,7 @@ if (BUILD_TOOLS)
             nitpick
         )
     endif()
-    
+
     foreach(TOOL ${ALL_TOOLS})
         check_test(${TOOL})
         if (${BUILD_TOOL_RESULT})

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()

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}")
@@ -20,3 +22,5 @@ if (UNIX AND NOT APPLE)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
   endif()
 endif ()
+
+install_beside_console()