Added package_libraries_for_deployment.

This commit is contained in:
NissimHadar 2019-04-08 18:33:33 -07:00
parent 523253aa13
commit 781949da4c
2 changed files with 8 additions and 8 deletions

View file

@ -21,8 +21,8 @@ endfunction()
if (BUILD_TOOLS) if (BUILD_TOOLS)
# Allow different tools for stable builds # Allow different tools for stable builds
if (STABLE_BUILD) if (STABLE_BUILD)
set(ALL_TOOLS set(ALL_TOOLS
udt-test udt-test
vhacd-util vhacd-util
frame-optimizer frame-optimizer
gpu-frame-player gpu-frame-player
@ -32,11 +32,10 @@ if (BUILD_TOOLS)
skeleton-dump skeleton-dump
atp-client atp-client
oven oven
vhacd-util
) )
else() else()
set(ALL_TOOLS set(ALL_TOOLS
udt-test udt-test
vhacd-util vhacd-util
frame-optimizer frame-optimizer
gpu-frame-player gpu-frame-player
@ -46,11 +45,10 @@ if (BUILD_TOOLS)
skeleton-dump skeleton-dump
atp-client atp-client
oven oven
vhacd-util
nitpick nitpick
) )
endif() endif()
foreach(TOOL ${ALL_TOOLS}) foreach(TOOL ${ALL_TOOLS})
check_test(${TOOL}) check_test(${TOOL})
if (${BUILD_TOOL_RESULT}) if (${BUILD_TOOL_RESULT})

View file

@ -12,7 +12,9 @@ target_link_libraries(${TARGET_NAME} ${VHACD_LIBRARIES})
setup_memory_debugger() setup_memory_debugger()
if (UNIX AND NOT APPLE) if (WIN32)
package_libraries_for_deployment()
elseif (UNIX AND NOT APPLE)
include(FindOpenMP) include(FindOpenMP)
if(OPENMP_FOUND) if(OPENMP_FOUND)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")