Merge branch 'master' into blender2.8
[blender.git] / build_files / cmake / macros.cmake
index 3941f08346ea9ce076e510ec4fde96bbb67a5721..d1dbe3885174f6e02fcfcefd600a388ac9e6b8b7 100644 (file)
@@ -370,6 +370,11 @@ function(setup_liblinks
        set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}" PARENT_SCOPE)
        set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}" PARENT_SCOPE)
 
+       # jemalloc must be early in the list, to be before pthread (see T57998)
+       if(WITH_MEM_JEMALLOC)
+               target_link_libraries(${target} ${JEMALLOC_LIBRARIES})
+       endif()
+
        target_link_libraries(
                ${target}
                ${PNG_LIBRARIES}
@@ -485,9 +490,6 @@ function(setup_liblinks
                        )
                endif()
        endif()
-       if(WITH_MEM_JEMALLOC)
-               target_link_libraries(${target} ${JEMALLOC_LIBRARIES})
-       endif()
        if(WITH_MOD_CLOTH_ELTOPO)
                target_link_libraries(${target} ${LAPACK_LIBRARIES})
        endif()