Commit d0b2db64 authored by Aaron Bray's avatar Aaron Bray
Browse files

Copy examples to install bin, remove pdbfluids from vulkan builds, include...

Copy examples to install bin, remove pdbfluids from vulkan builds, include shader compile to all build, minor clean up
parent 6ade2071
......@@ -6,7 +6,6 @@ include(imstkFind)
#-----------------------------------------------------------------------------
# Find All Headers and Libraries for VulkanSDK
#-----------------------------------------------------------------------------
set(VulkanSDK_LIB_DIR Lib)
imstk_find_header(VulkanSDK vulkan/vulkan.h)
imstk_find_libary(VulkanSDK vulkan-1 " ")#Use same library for debug)
......
......@@ -9,4 +9,6 @@ macro(imstk_add_executable target)
if (VTK_VERSION VERSION_GREATER_EQUAL "8.90")
vtk_module_autoinit(TARGETS ${target} MODULES ${VTK_LIBRARIES})
endif()
add_custom_command(TARGET ${target} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${target}> ${iMSTK_INSTALL_BIN_DIR})
endmacro()
......@@ -2,7 +2,7 @@
# Compile Shaders
#-----------------------------------------------------------------------------
add_custom_target(VulkanShaders)
add_custom_target(VulkanShaders ALL)
function(compileShaders sourceShader binaryShader)
add_custom_command(
TARGET VulkanShaders
......
......@@ -227,15 +227,12 @@ add_definitions(-D__TBB_NO_IMPLICIT_LINKAGE)
find_package( VegaFEM REQUIRED CONFIG )
# VRPN
set(OpenHapticsSDK_Dependency)
find_package( VRPN REQUIRED )
if(${PROJECT_NAME}_USE_OpenHaptics)
find_package( OpenHapticsSDK REQUIRED )
add_definitions( -DiMSTK_USE_OPENHAPTICS )
set(OpenHapticsSDK_Dependency OpenHapticsSDK)
else()
remove_definitions( -DiMSTK_USE_OPENHAPTICS )
unset(OpenHapticsSDK_Dependency)
endif()
# VTK
......
......@@ -16,6 +16,10 @@
#
###########################################################################
if(iMSTK_USE_Vulkan)
return()
endif()
project(Example-PBDFluids)
#-----------------------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment