Commit 95c8daa1 authored by Wieland Morgenstern's avatar Wieland Morgenstern

Apple: link to VS_LIB_DEFAULT if USE_DELAY_LOAD is disabled

parent d35604e4
......@@ -432,7 +432,7 @@ else()
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG_UP}}
-P ${CMAKE_SOURCE_DIR}/lib/generateFakeLibvideostitch.cmake
DEPENDS ${VS_LIB_DEFAULT})
if(USE_DELAY_LOAD)
if(USE_DELAY_LOAD AND MSVC)
add_dependencies(generateFakeLibvideostitch_${OUTPUTCONFIG_UP} ${VS_LIB_FAKE})
endif()
endforeach()
......@@ -463,7 +463,13 @@ function(link_target_to_libvideostitch TARGET_NAME)
set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS ${new_link_flags})
endif()
elseif(APPLE)
if (USE_DELAY_LOAD)
target_link_libraries(${TARGET_NAME} PRIVATE ${VS_LIB_FAKE})
else()
target_link_libraries(${TARGET_NAME} PRIVATE ${VS_LIB_DEFAULT})
endif()
# ensure the non-fake backend libs are built
if(GPU_BACKEND_CUDA)
add_dependencies(${TARGET_NAME} ${VS_LIB_CUDA})
......
......@@ -79,10 +79,14 @@ function(setup_av_plugin PLUGIN_NAME BACKEND_NAME USE_CUDA)
target_link_libraries(${PLUGIN_NAME} PRIVATE ${libmfxhw64} ${DirectX_LIB})
set_property(TARGET ${PLUGIN_NAME} APPEND_STRING PROPERTY LINK_FLAGS "/NODEFAULTLIB:libcmt /NODEFAULTLIB:libcmtd")
elseif(APPLE)
if (USE_DELAY_LOAD)
target_link_libraries(${PLUGIN_NAME} PRIVATE ${VS_LIB_FAKE})
else()
target_link_libraries(${PLUGIN_NAME} PRIVATE ${VS_LIB_DEFAULT})
endif()
else()
target_link_libraries(${PLUGIN_NAME} PRIVATE ${VS_LIB_DEFAULT})
endif()
# Unit tests
if(NOT WINDOWS)
......
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