[Bf-blender-cvs] [69c8248a1ce] blender2.7: Fixup for fix for OSX build using a build folder name with spaces
Dalai Felinto
noreply at git.blender.org
Mon Mar 4 16:54:08 CET 2019
Commit: 69c8248a1ce402cec7a3f334024d719979aff43f
Author: Dalai Felinto
Date: Fri Mar 1 17:07:06 2019 -0300
Branches: blender2.7
https://developer.blender.org/rB69c8248a1ce402cec7a3f334024d719979aff43f
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 c9acaa25216..9aecd463ccc 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -390,9 +390,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.
execute_process(
More information about the Bf-blender-cvs
mailing list