Commit: a446092beeb53fe1f03513be4b1da04d976bd600 Author: Ankit Meel Date: Tue Aug 3 23:36:59 2021 +0530 Branches: tmp_openmpfix https://developer.blender.org/rBa446092beeb53fe1f03513be4b1da04d976bd600
Remove fatal error, extra slash. =================================================================== M build_files/cmake/platform/platform_apple.cmake M source/creator/CMakeLists.txt =================================================================== diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index a85e9f23277..93b45f09a31 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -411,7 +411,7 @@ if(WITH_OPENMP) 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(OpenMP_LIBRARY_DIR "${LIBDIR}/openmp/lib/") + set(OpenMP_LIBRARY_DIR "${LIBDIR}/openmp/lib") set(OpenMP_LINKER_FLAGS "-L'${OpenMP_LIBRARY_DIR}' -lomp") set(OpenMP_LIBRARY "${OpenMP_LIBRARY_DIR}/libomp.dylib") endif() diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 52e9e449642..23a747be521 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1045,15 +1045,14 @@ elseif(APPLE) ) message(WARNING "OPENMP_CUSTOM=${OPENMP_CUSTOM} WITH_OPENMP=${WITH_OPENMP}") + message(WARNING "OpenMP_LIBRARY=${OpenMP_LIBRARY}") + message(WARNING "MAC_BLENDER_TARGET_DYLIBS_DIR=${MAC_BLENDER_TARGET_DYLIBS_DIR}") if(WITH_OPENMP AND OPENMP_CUSTOM) - message(WARNING "OpenMP_LIBRARY=${OpenMP_LIBRARY}") - message(WARNING "MAC_BLENDER_TARGET_DYLIBS_DIR=${MAC_BLENDER_TARGET_DYLIBS_DIR}") install( FILES "${OpenMP_LIBRARY}" DESTINATION "${MAC_BLENDER_TARGET_DYLIBS_DIR}" ) endif() - message(FATAL_ERROR "") if(WITH_COMPILER_ASAN) install( _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs