Commit: f197134426f3e416bfc1aea4ff706d654d555f1d
Author: Arto Kitula
Date: Fri May 11 21:56:13 2018 +0300
Branches: master
https://developer.blender.org/rBf197134426f3e416bfc1aea4ff706d654d555f1d
Platform: macOS. Allow building on directory with whitespace (For example
/Volumes/External HD/blender-build)
===================================================================
M build_files/cmake/platform/platform_apple.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_apple.cmake
b/build_files/cmake/platform/platform_apple.cmake
index caaf7b96d0e..93d7220c884 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -356,7 +356,7 @@ if(WITH_LLVM)
execute_process(COMMAND ${LLVM_CONFIG} --libfiles
OUTPUT_VARIABLE LLVM_LIBRARY
OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY})
+ string(REPLACE ".a /" ".a;/" LLVM_LIBRARY
${LLVM_LIBRARY})
else()
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS}
-lLLVM-3.4")
endif()
@@ -416,7 +416,7 @@ if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION}
VERSION_GREATER 5)
endif()
# Get rid of eventually clashes, we export some symbols explicite as local
set(PLATFORM_LINKFLAGS
- "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker
${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map"
+ "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker
'${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map'"
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
