Revert "Fix: Build failures when using path with spaces on macOS"
This reverts commit be63ebd961.
This doesn't work well with MSBuild, semicolons get escaped even in
verbatim mode.
This commit is contained in:
@@ -1015,7 +1015,10 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
|
||||
endif()
|
||||
if(NOT oclocids_ret EQUAL 0)
|
||||
list(REMOVE_ITEM CYCLES_ONEAPI_INTEL_BINARIES_ARCH ${device})
|
||||
message(STATUS "Cycles oneAPI: binaries for ${device} not supported by Intel Graphics Compiler/ocloc, skipped.")
|
||||
message(STATUS
|
||||
"Cycles oneAPI: "
|
||||
"binaries for ${device} not supported by Intel Graphics Compiler/ocloc, skipped."
|
||||
)
|
||||
endif()
|
||||
endforeach()
|
||||
list(JOIN CYCLES_ONEAPI_INTEL_BINARIES_ARCH "," gen_devices_string)
|
||||
|
||||
@@ -141,14 +141,13 @@ foreach(_file ${SRC_OSL})
|
||||
add_custom_command(
|
||||
OUTPUT ${_OSO_FILE}
|
||||
COMMAND
|
||||
${CMAKE_COMMAND} -E env "${PLATFORM_ENV_BUILD}"
|
||||
${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD}
|
||||
${OSL_COMPILER} -q -O2
|
||||
-I"${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
-I"${OSL_SHADER_DIR}"
|
||||
-o ${_OSO_FILE}
|
||||
${_OSL_FILE}
|
||||
DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS} ${OSL_COMPILER}
|
||||
VERBATIM # Correct escaping with spaces in PLATFORM_ENV_BUILD paths
|
||||
)
|
||||
list(APPEND SRC_OSO
|
||||
${_OSO_FILE}
|
||||
|
||||
@@ -112,7 +112,6 @@ add_custom_command(
|
||||
${CMAKE_CURRENT_BINARY_DIR}/dna_verify.cc
|
||||
${CMAKE_SOURCE_DIR}/source/blender/makesdna/
|
||||
DEPENDS makesdna
|
||||
VERBATIM # Correct escaping with spaces in PLATFORM_ENV_BUILD paths
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -462,7 +462,6 @@ add_custom_command(
|
||||
${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD}
|
||||
"$<TARGET_FILE:makesrna>" ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
DEPENDS makesrna
|
||||
VERBATIM # Correct escaping with spaces in PLATFORM_ENV_BUILD paths
|
||||
)
|
||||
|
||||
# Build bf_rna
|
||||
|
||||
Reference in New Issue
Block a user