[Bf-blender-cvs] [a3241a8ff79] blender2.8: CMake: Fix compilation with Bullet enabled

[Sergey Sharybin]

Commit: a3241a8ff79e0e5cdd485e278331d8ca3322447b
Author: Sergey Sharybin
Date:   Wed Sep 12 10:34:53 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa3241a8ff79e0e5cdd485e278331d8ca3322447b

CMake: Fix compilation with Bullet enabled

Obvious bug in recent CName cleanup commit, while BGE library
was indeed mentioned on that line it was to put Bullet libraries
after all the other libraries.

One day we should really switch to a CMake dependency graph to
take care of library dependencies.

===================================================================

M	build_files/cmake/macros.cmake

===================================================================

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 5ee1d88bfcb..620c843a15b 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -754,6 +754,10 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		list_insert_after(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_intern_rigidbody")
 	endif()
 
+	if(WITH_BULLET AND NOT WITH_SYSTEM_BULLET)
+		list_insert_after(BLENDER_SORTED_LIBS "extern_openjpeg" "extern_bullet")
+	endif()
+
 	if(WIN32)
 		list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect)
 	endif()