Merge branch 'master' into blender2.8
[blender.git] / build_files / cmake / macros.cmake
index 11fc3e110c13d5af225a7f40b0858f19d7698de6..6157730af8edba9c0e2fa9ecf5cf446d8ac26b7c 100644 (file)
@@ -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
@@ -592,6 +600,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_editor_curve
                bf_editor_gpencil
                bf_editor_interface
+               bf_editor_manipulator_library
                bf_editor_mesh
                bf_editor_metaball
                bf_editor_object
@@ -599,6 +608,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_editor_armature
                bf_editor_physics
                bf_editor_render
+               bf_editor_scene
                bf_editor_screen
                bf_editor_sculpt_paint
                bf_editor_sound
@@ -611,6 +621,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_python
                bf_python_ext
                bf_python_mathutils
+               bf_python_gawain
                bf_python_bmesh
                bf_freestyle
                bf_ikplugin
@@ -618,11 +629,14 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_alembic
                bf_bmesh
                bf_gpu
+               bf_draw
                bf_blenloader
                bf_blenkernel
                bf_physics
                bf_nodes
                bf_rna
+               bf_editor_manipulator_library  # rna -> manipulator bad-level calls
+               bf_python
                bf_imbuf
                bf_blenlib
                bf_depsgraph
@@ -663,6 +677,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
@@ -674,6 +690,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
                cycles_util
                cycles_subd
                bf_intern_opencolorio
+               bf_intern_gawain
                bf_intern_eigen
                extern_rangetree
                extern_wcwidth
@@ -750,10 +767,6 @@ 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()
@@ -1515,6 +1528,7 @@ function(find_python_package
                  NAMES
                    ${package}
                  HINTS
+                   "${PYTHON_LIBPATH}/"
                    "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/"
                    "${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/"
                  PATH_SUFFIXES