Commit: 63a4dc544702b7369ed87dc0c36ce1d1d0fb8e87
Author: Sebastián Barschkis
Date: Fri Mar 11 10:33:24 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB63a4dc544702b7369ed87dc0c36ce1d1d0fb8e87
cleanup in CMakeLists
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62d1842..eec1239 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2585,36 +2585,11 @@ endif()
#-----------------------------------------------------------------------------
# Configure mantaflow.
+
if(WITH_MOD_MANTA)
add_definitions(-DWITH_MANTA)
endif()
-#if(WITH_MOD_MANTA)
-# message("including manta")
-# include(ExternalProject)
-# set(QT_QMAKE_EXECUTABLE /usr/bin/qmake-4.8)
-# #set(BULLET_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/bullet2/src")
-# ExternalProject_Add(
-# MantaFlow
-# CVS_MODULE CMake
-## CVS_TAG -r CMake-2-6-4
-# #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:
-# # PATH=<INSTALL_DIR>
-# #CMAKE_ARGS -DGUI=OFF
-# # -DPREPDEBUG=ON
-# UPDATE_COMMAND ""
-# DOWNLOAD_COMMAND ""
-# INSTALL_COMMAND ""
-# SOURCE_DIR ${CMAKE_SOURCE_DIR}/source/blender/python/manta_pp
-#)
-#ExternalProject_Add_Step(MantaFlow forceconfigure
-# COMMAND ${CMAKE_COMMAND} -E echo "Force configure of MantaFlow"
-# DEPENDEES update
-# DEPENDERS configure
-# ALWAYS 0)
-##set_target_properties(MantaFlow PROPERTIES RUNTIME_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR})
-#endif()
-
#-----------------------------------------------------------------------------
# Extra compile flags
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
