forked from bartvdbraak/blender
OSX/CMAKE: make linking and bundling of clang omp lib work,
Cmake will still not find -fopenmp working, so the user must set WITH_OPENMP and flags manually
This commit is contained in:
parent
ace071f99e
commit
ad4c12fe01
@ -1854,6 +1854,12 @@ elseif(APPLE)
|
|||||||
message(STATUS "OSL not found")
|
message(STATUS "OSL not found")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(WITH_OPENMP AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
|
||||||
|
include_directories(${LIBDIR}/openmp/include)
|
||||||
|
LINK_DIRECTORIES(${LIBDIR}/openmp/lib)
|
||||||
|
execute_process(COMMAND cp ${LIBDIR}/openmp/lib/libiomp5.dylib ${CMAKE_BINARY_DIR}/bin/libiomp5.dylib) # needed for imtermediate binaries, due lib id is @loader_path
|
||||||
|
endif()
|
||||||
|
|
||||||
set(EXETYPE MACOSX_BUNDLE)
|
set(EXETYPE MACOSX_BUNDLE)
|
||||||
|
|
||||||
|
@ -773,6 +773,13 @@ elseif(APPLE)
|
|||||||
\${TARGETDIR}/blender.app/Contents/
|
\${TARGETDIR}/blender.app/Contents/
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(WITH_OPENMP AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
|
||||||
|
install(
|
||||||
|
FILES ${LIBDIR}/openmp/lib/libiomp5.dylib
|
||||||
|
DESTINATION ${TARGETDIR}/blender.app/Contents/MacOS
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
# python
|
# python
|
||||||
if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
|
if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
|
||||||
# the python zip is first extract as part of the build process,
|
# the python zip is first extract as part of the build process,
|
||||||
@ -843,7 +850,7 @@ elseif(APPLE)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user