[Bf-blender-cvs] [2c05b7f] fluid-mantaflow: clean up in cmake setup

Sebastián Barschkis noreply at git.blender.org
Sun Oct 23 21:32:08 CEST 2016


Commit: 2c05b7f8be520d167747226646a5d939ff3cc4e5
Author: Sebastián Barschkis
Date:   Sun Oct 23 21:28:08 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB2c05b7f8be520d167747226646a5d939ff3cc4e5

clean up in cmake setup

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

M	build_files/cmake/macros.cmake
M	source/creator/CMakeLists.txt

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 5a67ac9..3740517 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -630,6 +630,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		ge_phys_dummy
 		ge_phys_bullet
 		bf_intern_smoke
+		bf_intern_mantaflow
 		extern_lzma
 		extern_curve_fit_nd
 		ge_logic_ketsji
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index d92e4e3..17c28ba 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1142,20 +1142,6 @@ add_dependencies(blender makesdna)
 setup_blender_sorted_libs()
 
 # -----------------------------------------------------------------------------
-# Mantaflow Force linking
-if(UNIX AND NOT APPLE)
-	SET(MANTA_LINK_LIBRARIES -Wl,--whole-archive bf_intern_mantaflow -Wl,--no-whole-archive)
-
-elseif(WIN32)
-	SET(MANTA_LINK_LIBRARIES bf_intern_mantaflow)
-
-elseif(APPLE)
-	SET(MANTA_LINK_LIBRARIES -force_load bf_intern_mantaflow)
-endif()
-
-target_link_libraries(blender ${MANTA_LINK_LIBRARIES})
-
-# -----------------------------------------------------------------------------
 # Setup link libs
 target_link_libraries(blender ${BLENDER_SORTED_LIBS})




More information about the Bf-blender-cvs mailing list