Merge branch 'master' into blender2.8
[blender.git] / build_files / cmake / macros.cmake
index e3eb4d9241a61a42b88d9c530ea2500f50c820d3..09bc01fcae33010d57767a34977b88779d121c63 100644 (file)
@@ -326,7 +326,7 @@ function(SETUP_LIBDIRS)
                        link_directories(${JACK_LIBPATH})
                endif()
                if(WITH_CODEC_SNDFILE)
                        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})
                endif()
                if(WITH_FFTW3)
                        link_directories(${FFTW3_LIBPATH})
@@ -407,7 +407,7 @@ function(setup_liblinks
                target_link_libraries(${target} ${JACK_LIBRARIES})
        endif()
        if(WITH_CODEC_SNDFILE)
                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_SDL AND NOT WITH_SDL_DYNLOAD)
                target_link_libraries(${target} ${SDL_LIBRARY})
@@ -555,6 +555,12 @@ function(SETUP_BLENDER_SORTED_LIBS)
                endif()
        endif()
 
                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
        # Sort libraries
        set(BLENDER_SORTED_LIBS
                bf_windowmanager
@@ -585,12 +591,14 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_editor_curve
                bf_editor_gpencil
                bf_editor_interface
                bf_editor_curve
                bf_editor_gpencil
                bf_editor_interface
+               bf_editor_manipulator_library
                bf_editor_mesh
                bf_editor_metaball
                bf_editor_object
                bf_editor_armature
                bf_editor_physics
                bf_editor_render
                bf_editor_mesh
                bf_editor_metaball
                bf_editor_object
                bf_editor_armature
                bf_editor_physics
                bf_editor_render
+               bf_editor_scene
                bf_editor_screen
                bf_editor_sculpt_paint
                bf_editor_sound
                bf_editor_screen
                bf_editor_sculpt_paint
                bf_editor_sound
@@ -603,6 +611,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_python
                bf_python_ext
                bf_python_mathutils
                bf_python
                bf_python_ext
                bf_python_mathutils
+               bf_python_gawain
                bf_python_bmesh
                bf_freestyle
                bf_ikplugin
                bf_python_bmesh
                bf_freestyle
                bf_ikplugin
@@ -610,11 +619,14 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_alembic
                bf_bmesh
                bf_gpu
                bf_alembic
                bf_bmesh
                bf_gpu
+               bf_draw
                bf_blenloader
                bf_blenkernel
                bf_physics
                bf_nodes
                bf_rna
                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
                bf_imbuf
                bf_blenlib
                bf_depsgraph
@@ -655,6 +667,8 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_blenfont
                bf_blentranslation
                bf_intern_audaspace
                bf_blenfont
                bf_blentranslation
                bf_intern_audaspace
+               audaspace
+               audaspace-py
                bf_intern_mikktspace
                bf_intern_dualcon
                bf_intern_cycles
                bf_intern_mikktspace
                bf_intern_dualcon
                bf_intern_cycles
@@ -666,6 +680,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
                cycles_util
                cycles_subd
                bf_intern_opencolorio
                cycles_util
                cycles_subd
                bf_intern_opencolorio
+               bf_intern_gawain
                bf_intern_eigen
                extern_rangetree
                extern_wcwidth
                bf_intern_eigen
                extern_rangetree
                extern_wcwidth
@@ -1504,6 +1519,7 @@ function(find_python_package
                  NAMES
                    ${package}
                  HINTS
                  NAMES
                    ${package}
                  HINTS
+                   "${PYTHON_LIBPATH}/"
                    "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/"
                    "${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/"
                  PATH_SUFFIXES
                    "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/"
                    "${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/"
                  PATH_SUFFIXES