flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

CMake: Fix builds in folders with spaces

Browse Source
This commit is contained in:
Mattes D 2019-12-29 10:28:11 +01:00
parent 5df6d4f535
commit 2894ce3812
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/CMakeLists.txt
View File

@ -347,10 +347,6 @@ SET_TARGET_PROPERTIES(${CMAKE_PROJECT_NAME} PROPERTIES
# If the orig and link point to the same thing, does nothing (-> in-source build) # If the orig and link point to the same thing, does nothing (-> in-source build)
# If ${link} already exists, does nothing. # If ${link} already exists, does nothing.
function(make_symlink orig link) function(make_symlink orig link)
# Get OS dependent path to use in `execute_process`
file(TO_NATIVE_PATH "${orig}" orig)
file(TO_NATIVE_PATH "${link}" link)
# If both are the same, or link already exists, bail out: # If both are the same, or link already exists, bail out:
if ("${orig}" STREQUAL "${link}") if ("${orig}" STREQUAL "${link}")
return() return()
@ -364,6 +360,8 @@ function(make_symlink orig link)
if (CMAKE_HOST_UNIX) if (CMAKE_HOST_UNIX)
set(command ln -s ${orig} ${link}) set(command ln -s ${orig} ${link})
else() else()
file(TO_NATIVE_PATH "${orig}" orig)
file(TO_NATIVE_PATH "${link}" link)
if (IS_DIRECTORY ${orig}) if (IS_DIRECTORY ${orig})
set(command cmd.exe /c mklink /j ${link} ${orig}) set(command cmd.exe /c mklink /j ${link} ${orig})
else() else()
@ -374,11 +372,12 @@ function(make_symlink orig link)
execute_process( execute_process(
COMMAND ${command} COMMAND ${command}
RESULT_VARIABLE result RESULT_VARIABLE result
ERROR_VARIABLE output ERROR_VARIABLE stderr
OUTPUT_VARIABLE stdout
) )
if (NOT ${result} EQUAL 0) if (NOT ${result} EQUAL 0)
message(FATAL_ERROR "Could not create symbolic link for: ${link} --> ${orig}: ${output}") message(FATAL_ERROR "Could not create symbolic link for: ${link} --> ${orig}: ${stderr} ${stdout}")
endif() endif()
endfunction(make_symlink) endfunction(make_symlink)