AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-30 15:20:07 +00:00
Code Issues Releases Wiki Activity

Comment out CMake logic that attempts to copy glfw3 dll's, which fails in some cases.

Browse Source 
Fixes #774
This commit is contained in:
manuelk 2016-01-13 11:47:24 -08:00
parent 4746ab4bc9
commit 423d7eff79
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
CMakeLists.txt
View File

@ -703,23 +703,27 @@ macro(_add_glfw_executable target)
_add_possibly_cuda_executable(${target} ${ARGN})
if(WIN32)
# Windows needs some of its dependency dll's copied into the same
# directory as the executable.
set( LIBRARIES ${GLFW_LIBRARIES})
foreach (LIB ${LIBRARIES} )
string(REPLACE ".lib" ".dll" DLL ${LIB})
string(REPLACE ".LIB" ".DLL" DLL ${DLL})
if (EXISTS ${DLL})
add_custom_command(
TARGET ${target} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${DLL}
$<TARGET_FILE_DIR:${target}>
)
endif()
endforeach()
endif()
#
# manuelk : commenting this out as it seems to be causing more problems than
# it is worth. Moving glfw as a native git recursive dependency will make this
# redundant anyway.
#
# if(WIN32)
# # Windows needs some of its dependency dll's copied into the same
# # directory as the executable.
# set(LIBRARIES ${GLFW_LIBRARIES})
# foreach (LIB ${LIBRARIES} )
# string(REPLACE ".lib" ".dll" DLL ${LIB})
# string(REPLACE ".LIB" ".DLL" DLL ${DLL})
# add_custom_command(
# TARGET ${target} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy_if_different
# ${DLL}
# $<TARGET_FILE_DIR:${target}>
# )
# endforeach()
# endif()
endmacro()