diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-13 04:05:49 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-13 04:05:49 +0300 |
| commit | cdc31c3e6e953b8e10c757db113b7a60f701e1dd (patch) | |
| tree | 6bb85293faf6b7ab7ad7e8d169106584590fbc94 /build_files/cmake/platform/platform_unix.cmake | |
| parent | 49d51a1e6246f00233abf54a8b24b5d829848e44 (diff) | |
| parent | 40dbf2fc0000f2905d436fc28b93a9b97431f72d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake/platform/platform_unix.cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index d5e29164696..306a09a3a5b 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -23,6 +23,19 @@ # Libraries configuration for any *nix system including Linux and Unix. +# Detect precompiled library directory +set(LIBDIR_NAME ${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}) +string(TOLOWER ${LIBDIR_NAME} LIBDIR_NAME) +set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_NAME}) + +if(EXISTS ${LIBDIR}) + file(GLOB LIB_SUBDIRS ${LIBDIR}/*) + set(CMAKE_PREFIX_PATH ${LIB_SUBDIRS}) + set(WITH_STATIC_LIBS ON) + set(WITH_OPENMP_STATIC ON) +endif() + +# Wrapper to prefer static libraries macro(find_package_wrapper) if(WITH_STATIC_LIBS) find_package_static(${ARGV}) @@ -141,8 +154,15 @@ if(WITH_CODEC_SNDFILE) endif() if(WITH_CODEC_FFMPEG) - set(FFMPEG /usr CACHE PATH "FFMPEG Directory") - set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries") + if(EXISTS ${LIBDIR}) + # For precompiled lib directory, all ffmpeg dependencies are in the same folder + file(GLOB ffmpeg_libs ${LIBDIR}/ffmpeg/lib/*.a ${LIBDIR}/sndfile/lib/*.a) + set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG Directory") + set(FFMPEG_LIBRARIES ${ffmpeg_libs} ${ffmpeg_libs} CACHE STRING "FFMPEG Libraries") + else() + set(FFMPEG /usr CACHE PATH "FFMPEG Directory") + set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries") + endif() mark_as_advanced(FFMPEG) @@ -329,6 +349,14 @@ if(WITH_OPENCOLORIO) endif() if(WITH_LLVM) + # Symbol conflicts with same UTF library used by OpenCollada + if(EXISTS ${LIBDIR}) + set(LLVM_STATIC ON) + if(WITH_OPENCOLLADA) + list(REMOVE_ITEM OPENCOLLADA_LIBRARIES ${OPENCOLLADA_UTF_LIBRARY}) + endif() + endif() + find_package_wrapper(LLVM) if(NOT LLVM_FOUND) |