[Bf-blender-cvs] [42faf52d8bc] master: Fixup for fix for OSX build using a build folder name with spaces

Dalai Felinto noreply at git.blender.org
Fri Mar 1 21:11:26 CET 2019


Commit: 42faf52d8bcae3b33164069c4c692152cf42b9b3
Author: Dalai Felinto
Date:   Fri Mar 1 17:07:06 2019 -0300
Branches: master
https://developer.blender.org/rB42faf52d8bcae3b33164069c4c692152cf42b9b3

Fixup for fix for OSX build using a build folder name with spaces

Bug introduced on: 1f22e3f311e74031c3c01714117d759d3e3de3f1.
This was making regular Mac builds to fail, where they were not failing before.

Tested by William Reynish.

===================================================================

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 56ec5ad0df9..4047a8f134d 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -389,9 +389,9 @@ if(WITH_OPENMP)
 		message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
 		set(OPENMP_CUSTOM ON)
 		set(OPENMP_FOUND ON)
-		set(OpenMP_C_FLAGS "-Xclang -fopenmp -I\"${LIBDIR}/openmp/include\"")
-		set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -I\"${LIBDIR}/openmp/include\"")
-		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L\"${LIBDIR}/openmp/lib\" -lomp")
+		set(OpenMP_C_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
+		set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L'${LIBDIR}/openmp/lib' -lomp")
 
 		# Copy libomp.dylib to allow executables like datatoc to work.
 		if(CMAKE_MAKE_PROGRAM MATCHES "xcodebuild")



More information about the Bf-blender-cvs mailing list