[Bf-blender-cvs] [7752cfb] soc-2014-fluid: cleaned cmakelists file

[Roman Pogribnyi]

Commit: 7752cfb1d824e4dfefafaeec467f2d0e2e56ac06
Author: Roman Pogribnyi
Date:   Mon Jul 21 16:48:52 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB7752cfb1d824e4dfefafaeec467f2d0e2e56ac06

cleaned cmakelists file

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

M	source/blender/python/manta_pp/CMakeLists.txt
M	source/blender/python/manta_pp/source/plugin/advection.cpp

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

diff --git a/source/blender/python/manta_pp/CMakeLists.txt b/source/blender/python/manta_pp/CMakeLists.txt
index c965d21..df6cf3d 100755
--- a/source/blender/python/manta_pp/CMakeLists.txt
+++ b/source/blender/python/manta_pp/CMakeLists.txt
@@ -18,7 +18,6 @@ SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 SET(VERBOSE 1) 
 
 SET(MANTAVERSION "0.6")
-
 #******************************************************************************
 # Default paths
 # - CMake's path finder is completely useless for Qt5 + Python on Win64
@@ -146,6 +145,7 @@ SET(PP_SOURCES
 	
 	source/plugin/pressure.cpp
 	source/plugin/initplugins.cpp
+	#PR changed
 	source/plugin/advection.cpp
 	source/plugin/extforces.cpp
 	source/plugin/kepsilon.cpp
@@ -177,7 +177,9 @@ SET(PP_HEADERS
 	source/edgecollapse.h
 	source/vortexpart.h
 	source/turbulencepart.h
-	#source/test.h    
+	#source/test.h
+	#PR changed
+#	source/advection.h
 )
 
 # no pre-processing needed
@@ -241,10 +243,11 @@ if (CUDA)
 endif()
 
 # include dirs
+message("PRincluding _   ${CMAKE_CURRENT_BINARY_DIR}/${PP_PATH}/source")
 SET(INCLUDE_PATHS
    source/pwrapper
    source/cuda
-   source/util	
+   source/util
    ${CMAKE_CURRENT_BINARY_DIR}/${PP_PATH}/source   
 )
 
@@ -450,12 +453,18 @@ MESSAGE("PR_prepdebug2")
 list(APPEND SOURCES ${PP_REGCPP})
 #MESSAGE("\nPR_prepdebug_1 AFTER REGCPP ${SOURCES}")
 
-add_custom_target(run ALL
-    DEPENDS SOURCES)	
+#add_custom_target(run ALL
+#    DEPENDS SOURCES)	
 
 MESSAGE("PR_prepdebug3")
 
 #******************************************************************************
+#PR finding what is so special about GUI
+#list(APPEND INCLUDE_PATHS ${CMAKE_CURRENT_BINARY_DIR}
+#				${CMAKE_CURRENT_BINARY_DIR}/${PP_PATH}/source/gui source/gui)
+#SET(F_LINKADD "${F_LINKADD} -framework OpenGL ")
+
+#******************************************************************************
 # QT for GUI
 
 if(GUI)
diff --git a/source/blender/python/manta_pp/source/plugin/advection.cpp b/source/blender/python/manta_pp/source/plugin/advection.cpp
index 54e8820..a2afaf8 100644
--- a/source/blender/python/manta_pp/source/plugin/advection.cpp
+++ b/source/blender/python/manta_pp/source/plugin/advection.cpp
@@ -15,7 +15,7 @@
 #include "../util/vectorbase.h"
 #include "grid.h"
 #include "kernel.h"
-
+ 
 using namespace std;
 
 namespace Manta {