diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-26 17:54:13 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-26 17:54:13 +0300 |
| commit | 94d88df3a8954f8c9c3be3c6a4ea9dce0dceb849 (patch) | |
| tree | 1b9751fb6b665de1203f079d5d2bafabd44eb007 /build_files/build_environment | |
| parent | 115e1d441b5d005bb3c53a134d1ad2683ffb9735 (diff) | |
| parent | b7a9e980a11a085a3bc7ef8e267b967197f47447 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'build_files/build_environment')
| -rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 4 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/openmp.cmake | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index d79d91f2b90..a281eb900e3 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -131,6 +131,10 @@ harvest(lame/lib ffmpeg/lib "*.a") harvest(clang/bin llvm/bin "clang-format") harvest(llvm/bin llvm/bin "llvm-config") harvest(llvm/lib llvm/lib "libLLVM*.a") +if(APPLE) + harvest(openmp/lib openmp/lib "*") + harvest(openmp/include openmp/include "*.h") +endif() harvest(ogg/lib ffmpeg/lib "*.a") harvest(openal/include openal/include "*.h") if(UNIX AND NOT APPLE) diff --git a/build_files/build_environment/cmake/openmp.cmake b/build_files/build_environment/cmake/openmp.cmake index ba8e6248126..d8224020ecf 100644 --- a/build_files/build_environment/cmake/openmp.cmake +++ b/build_files/build_environment/cmake/openmp.cmake @@ -23,7 +23,8 @@ ExternalProject_Add(external_openmp URL_HASH MD5=${OPENMP_HASH} PREFIX ${BUILD_DIR}/openmp CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS} - INSTALL_DIR ${LIBDIR}/clang + INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id '@executable_path/../Resources/lib/libomp.dylib' runtime/src/libomp.dylib && make install + INSTALL_PATH ${LIBDIR}/openmp ) add_dependencies( |