diff options
Diffstat (limited to 'build_files/cmake/platform/platform_unix.cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index ff4c31d69c3..0d486c84fe6 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -16,9 +16,6 @@ # # The Original Code is Copyright (C) 2016, Blender Foundation # All rights reserved. -# -# Contributor(s): Sergey Sharybin. -# # ***** END GPL LICENSE BLOCK ***** # Libraries configuration for any *nix system including Linux and Unix. @@ -42,6 +39,10 @@ if(EXISTS ${LIBDIR}) set(WITH_OPENMP_STATIC ON) endif() +if(WITH_STATIC_LIBS) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++") +endif() + # Wrapper to prefer static libraries macro(find_package_wrapper) if(WITH_STATIC_LIBS) @@ -155,7 +156,7 @@ endif() # Codecs if(WITH_CODEC_SNDFILE) find_package_wrapper(SndFile) - if(NOT SNDFILE_FOUND) + if(NOT LIBSNDFILE_FOUND) set(WITH_CODEC_SNDFILE OFF) endif() endif() @@ -245,13 +246,17 @@ if(WITH_OPENVDB) find_package_wrapper(OpenVDB) find_package_wrapper(TBB) find_package_wrapper(Blosc) - if(NOT OPENVDB_FOUND OR NOT TBB_FOUND) + if(NOT TBB_FOUND) + set(WITH_OPENVDB OFF) + set(WITH_OPENVDB_BLOSC OFF) + message(STATUS "TBB not found, disabling OpenVDB") + elseif(NOT OPENVDB_FOUND) set(WITH_OPENVDB OFF) set(WITH_OPENVDB_BLOSC OFF) message(STATUS "OpenVDB not found, disabling it") elseif(NOT BLOSC_FOUND) set(WITH_OPENVDB_BLOSC OFF) - message(STATUS "Blosc not found, disabling it") + message(STATUS "Blosc not found, disabling it for OpenVBD") endif() endif() |