diff options
Diffstat (limited to 'build_files/cmake/macros.cmake')
| -rw-r--r-- | build_files/cmake/macros.cmake | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 836fd5f1a6b..62caf31dfd6 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -318,7 +318,7 @@ function(SETUP_LIBDIRS) link_directories(${JACK_LIBPATH}) endif() if(WITH_CODEC_SNDFILE) - link_directories(${SNDFILE_LIBPATH}) + link_directories(${LIBSNDFILE_LIBPATH}) endif() if(WITH_FFTW3) link_directories(${FFTW3_LIBPATH}) @@ -398,14 +398,11 @@ function(setup_liblinks target_link_libraries(${target} ${JACK_LIBRARIES}) endif() if(WITH_CODEC_SNDFILE) - target_link_libraries(${target} ${SNDFILE_LIBRARIES}) + target_link_libraries(${target} ${LIBSNDFILE_LIBRARIES}) endif() if(WITH_SDL AND NOT WITH_SDL_DYNLOAD) target_link_libraries(${target} ${SDL_LIBRARY}) endif() - if(WITH_CODEC_QUICKTIME) - target_link_libraries(${target} ${QUICKTIME_LIBRARIES}) - endif() if(WITH_IMAGE_TIFF) target_link_libraries(${target} ${TIFF_LIBRARY}) endif() @@ -549,6 +546,12 @@ function(SETUP_BLENDER_SORTED_LIBS) endif() endif() + if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE) + list(APPEND BLENDER_LINK_LIBS + audaspace + audaspace-py) + endif() + # Sort libraries set(BLENDER_SORTED_LIBS bf_windowmanager @@ -599,6 +602,7 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_python bf_python_ext bf_python_mathutils + bf_python_gawain bf_python_bmesh bf_freestyle bf_ikplugin @@ -654,6 +658,8 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_blenfont bf_blentranslation bf_intern_audaspace + audaspace + audaspace-py bf_intern_mikktspace bf_intern_dualcon bf_intern_cycles @@ -721,10 +727,6 @@ function(SETUP_BLENDER_SORTED_LIBS) list(APPEND BLENDER_SORTED_LIBS bf_intern_itasc) endif() - if(WITH_CODEC_QUICKTIME) - list(APPEND BLENDER_SORTED_LIBS bf_quicktime) - endif() - if(WITH_MOD_BOOLEAN) list(APPEND BLENDER_SORTED_LIBS extern_carve) endif() @@ -1509,6 +1511,7 @@ function(find_python_package NAMES ${package} HINTS + "${PYTHON_LIBPATH}/" "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/" "${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/" PATH_SUFFIXES |