diff options
Diffstat (limited to 'build_files/cmake/macros.cmake')
| -rw-r--r-- | build_files/cmake/macros.cmake | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 54a41f95819..a4f8d9397aa 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -326,7 +326,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}) @@ -412,7 +412,7 @@ 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}) @@ -560,6 +560,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 @@ -580,8 +586,10 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_editor_space_outliner bf_editor_space_script bf_editor_space_sequencer + bf_editor_space_statusbar bf_editor_space_text bf_editor_space_time + bf_editor_space_topbar bf_editor_space_userpref bf_editor_space_view3d bf_editor_space_clip @@ -590,15 +598,17 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_editor_util bf_editor_uvedit bf_editor_curve - bf_editor_gpencil bf_editor_interface + bf_editor_gizmo_library bf_editor_mesh bf_editor_metaball bf_editor_object + bf_editor_gpencil bf_editor_lattice bf_editor_armature bf_editor_physics bf_editor_render + bf_editor_scene bf_editor_screen bf_editor_sculpt_paint bf_editor_sound @@ -611,18 +621,25 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_python bf_python_ext bf_python_mathutils + bf_python_gpu bf_python_bmesh bf_freestyle bf_ikplugin bf_modifiers + bf_gpencil_modifiers bf_alembic bf_bmesh bf_gpu + bf_draw bf_blenloader bf_blenkernel + bf_shader_fx + bf_gpencil_modifiers bf_physics bf_nodes bf_rna + bf_editor_gizmo_library # rna -> gizmo bad-level calls + bf_python bf_imbuf bf_blenlib bf_depsgraph @@ -660,9 +677,13 @@ function(SETUP_BLENDER_SORTED_LIBS) extern_openjpeg ge_videotex bf_dna + bf_blenfont + bf_gpu # duplicate for blenfont bf_blentranslation bf_intern_audaspace + audaspace + audaspace-py bf_intern_mikktspace bf_intern_dualcon bf_intern_cycles @@ -674,6 +695,7 @@ function(SETUP_BLENDER_SORTED_LIBS) cycles_util cycles_subd bf_intern_opencolorio + bf_intern_gawain bf_intern_eigen extern_rangetree extern_wcwidth @@ -682,6 +704,7 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_intern_glew_mx bf_intern_clog + bf_intern_opensubdiv ) if(NOT WITH_SYSTEM_GLOG) @@ -750,18 +773,10 @@ function(SETUP_BLENDER_SORTED_LIBS) list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet") endif() - if(WITH_GAMEENGINE_DECKLINK) - list(APPEND BLENDER_SORTED_LIBS bf_intern_decklink) - endif() - if(WIN32) list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect) endif() - if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV) - list(APPEND BLENDER_SORTED_LIBS bf_intern_opensubdiv) - endif() - if(WITH_OPENVDB) list(APPEND BLENDER_SORTED_LIBS bf_intern_openvdb) endif() @@ -1376,6 +1391,7 @@ function(find_python_package NAMES ${package} HINTS + "${PYTHON_LIBPATH}/" "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/" "${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/" PATH_SUFFIXES |