Merge remote-tracking branch 'public/pr/1465' into mbedtls-2.1

The previous merge of PR #1465 was based on an out of date version of the PR
and missed two commits, so this merges the PR again.
This commit is contained in:
Simon Butcher 2018-06-12 09:25:24 +01:00
commit 66f8579902

View file

@ -29,7 +29,11 @@ function(link_to_source base_name)
if (CMAKE_HOST_UNIX)
set(command ln -s ${target} ${link})
else()
set(command cmd.exe /c mklink /j ${link} ${target})
if (IS_DIRECTORY ${target})
set(command cmd.exe /c mklink /j ${link} ${target})
else()
set(command cmd.exe /c mklink /h ${link} ${target})
endif()
endif()
execute_process(COMMAND ${command}