Merge branch 'master' into blender2.8
[blender.git] / build_files / cmake / macros.cmake
index 2e7ed80184621ea3cc8f737bee13070afaee24bf..e250eae19a4d3b1b21487efe644cbaca7c0e3569 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})
@@ -417,7 +417,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})
@@ -565,6 +565,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
@@ -585,25 +591,28 @@ 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
 
                bf_editor_transform
-               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,23 +620,31 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_editor_datafiles
                bf_editor_mask
                bf_editor_io
+               bf_editor_util
 
                bf_render
                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
@@ -644,30 +661,19 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_intern_guardedalloc
                bf_intern_ctr
                bf_intern_utfconv
-               ge_blen_routines
-               ge_converter
-               ge_phys_dummy
-               ge_phys_bullet
                bf_intern_smoke
                extern_lzma
                extern_curve_fit_nd
-               ge_logic_ketsji
-               extern_recastnavigation
-               ge_logic
-               ge_rasterizer
-               ge_oglrasterizer
-               ge_logic_expressions
-               ge_scenegraph
-               ge_logic_network
-               ge_logic_ngnetwork
-               ge_logic_loopbacknetwork
                bf_intern_moto
                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
@@ -679,6 +685,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
                cycles_util
                cycles_subd
                bf_intern_opencolorio
+               bf_intern_gawain
                bf_intern_eigen
                extern_rangetree
                extern_wcwidth
@@ -687,6 +694,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
 
                bf_intern_glew_mx
                bf_intern_clog
+               bf_intern_opensubdiv
                bf_intern_numaapi
        )
 
@@ -753,21 +761,13 @@ function(SETUP_BLENDER_SORTED_LIBS)
        endif()
 
        if(WITH_BULLET AND NOT WITH_SYSTEM_BULLET)
-               list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet")
-       endif()
-
-       if(WITH_GAMEENGINE_DECKLINK)
-               list(APPEND BLENDER_SORTED_LIBS bf_intern_decklink)
+               list_insert_after(BLENDER_SORTED_LIBS "extern_openjpeg" "extern_bullet")
        endif()
 
        if(WIN32)
                list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect)
        endif()
 
-       if(WITH_OPENSUBDIV)
-               list(APPEND BLENDER_SORTED_LIBS bf_intern_opensubdiv)
-       endif()
-
        if(WITH_OPENVDB)
                list(APPEND BLENDER_SORTED_LIBS bf_intern_openvdb)
        endif()
@@ -1388,6 +1388,7 @@ function(find_python_package
                  NAMES
                    ${package}
                  HINTS
+                   "${PYTHON_LIBPATH}/"
                    "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/"
                    "${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/"
                  PATH_SUFFIXES